Commit c5e603ee authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix i2d_X509_AUX: pp can be NULL. 



Reported by David Benjamin

Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
(cherry picked from commit 05aef4bb)
parent a8d40f64

crypto/asn1/x_x509.c

+3 −2
Original line number Diff line number Diff line
@@ -202,13 +202,14 @@ 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) {

        if (start != NULL)

            *pp = start;

        return tmplen;

    }