[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_1-stable has been updated
       via  1d29506fe0cfd585afcb17dfdf3ac42a30ab4087 (commit)
      from  66ce2861c172b2eb344906f424e593337fbd1af8 (commit)


- Log -----------------------------------------------------------------
commit 1d29506fe0cfd585afcb17dfdf3ac42a30ab4087
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon May 2 17:33:50 2016 +0100

    Fix i2d_X509_AUX: pp can be NULL.
    
    Reported by David Benjamin
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    (cherry picked from commit 05aef4bbdbc18e7b9490512cdee41e8a608bcc0e)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/x_x509.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 38ede71..1500871 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;