summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypto/asn1/x_x509.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 38ede71bb9..1500871577 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -202,14 +202,15 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
int i2d_X509_AUX(X509 *a, unsigned char **pp)
{
int length, tmplen;
- unsigned char *start = *pp;
+ unsigned char *start = pp != NULL ? *pp : NULL;
length = i2d_X509(a, pp);
if (length < 0 || a == NULL)
return length;
tmplen = i2d_X509_CERT_AUX(a->aux, pp);
if (tmplen < 0) {
- *pp = start;
+ if (start != NULL)
+ *pp = start;
return tmplen;
}
length += tmplen;