generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix i2d_X509_AUX: pp can be NULL.

Browse Source 
Reported by David Benjamin

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit 05aef4bbdbc18e7b9490512cdee41e8a608bcc0e)
This commit is contained in:
Dr. Stephen Henson 2016-05-02 17:33:50 +01:00
parent 66ce2861c1
commit 1d29506fe0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/asn1/x_x509.c
View File

@ -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 i2d_X509_AUX(X509 *a, unsigned char **pp)
{ {
int length, tmplen; int length, tmplen;
unsigned char *start = *pp; unsigned char *start = pp != NULL ? *pp : NULL;
length = i2d_X509(a, pp); length = i2d_X509(a, pp);
if (length < 0 || a == NULL) if (length < 0 || a == NULL)
return length; return length;
tmplen = i2d_X509_CERT_AUX(a->aux, pp); tmplen = i2d_X509_CERT_AUX(a->aux, pp);
if (tmplen < 0) { if (tmplen < 0) {
*pp = start; if (start != NULL)
*pp = start;
return tmplen; return tmplen;
} }
length += tmplen; length += tmplen;