mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

d2i_X509(): Make deallocation behavior consistent with d2i_X509_AUX()

Browse Source 
Partly fixes #13754

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13755)
This commit is contained in:
Dr. David von Oheimb 2020-12-30 09:46:38 +01:00 committed by Dr. David von Oheimb
parent 48116c2d0f
commit 3339606a38
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/x509/x_x509.c
View File

@ -125,12 +125,16 @@ IMPLEMENT_ASN1_DUP_FUNCTION(X509)
X509 *d2i_X509(X509 **a, const unsigned char **in, long len)
{
X509 *cert = NULL;
int free_on_error = a != NULL && *a == NULL;
cert = (X509 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, (X509_it()));
/* Only cache the extensions if the cert object was passed in */
if (cert != NULL && a != NULL) {
if (!x509v3_cache_extensions(cert))
if (!x509v3_cache_extensions(cert)) {
if (free_on_error)
X509_free(cert);
cert = NULL;
}
}
return cert;
}