X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fx509%2Fx_x509.c;h=22a7e5922d421e6125e1e3f45c0486c2701772b3;hp=34639555baae981ffc39ead5e9dd382670a39171;hb=446ba8de9af9aa4fa3debc7c76a38f4efed47a62;hpb=c001ce33137993a0c4ff15060ed1639826bfca0b

diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c
index 34639555ba..22a7e5922d 100644
--- a/crypto/x509/x_x509.c
+++ b/crypto/x509/x_x509.c
@@ -182,10 +182,19 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
 
 int i2d_X509_AUX(X509 *a, unsigned char **pp)
 {
-    int length;
+    int length, tmplen;
+    unsigned char *start = *pp;
     length = i2d_X509(a, pp);
-    if (a)
-        length += i2d_X509_CERT_AUX(a->aux, pp);
+    if (length < 0 || a == NULL)
+        return length;
+
+    tmplen = i2d_X509_CERT_AUX(a->aux, pp);
+    if (tmplen < 0) {
+        *pp = start;
+        return tmplen;
+    }
+    length += tmplen;
+
     return length;
 }