diff options
| author | Matt Caswell <matt@openssl.org> | 2015-03-19 10:16:32 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-19 12:58:35 +0000 |
| commit | 18029a3d0739284cadb309ea0fd498379b0bcfdb (patch) | |
| tree | 0f81f0f667d57520a19b67cdba8c6a9f0bb98b95 /crypto/asn1 | |
| parent | 7b22e8d01f8e84b794fc62ada4c9de8ab2021879 (diff) | |
Fix a failure to NULL a pointer freed on error.
Reported by the LibreSSL project as a follow on to CVE-2015-0209
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/x_x509.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index cd838e01c1..55319acf9c 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -172,8 +172,14 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) { const unsigned char *q; X509 *ret; + int freeret = 0; + /* Save start position */ q = *pp; + + if(!a || *a == NULL) { + freeret = 1; + } ret = d2i_X509(a, pp, length); /* If certificate unreadable then forget it */ if (!ret) @@ -186,7 +192,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) goto err; return ret; err: - X509_free(ret); + if(freeret) { + X509_free(ret); + if (a) + *a = NULL; + } return NULL; } |