feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for zd4179, 4181, 4182

Browse Source
This commit is contained in:
Eric Blankenhorn
2018-08-01 15:56:15 -05:00
parent 8bc5bc227d
commit ba2f0fd8fc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ssl.c
View File

@@ -14553,9 +14553,10 @@ WOLFSSL_X509* wolfSSL_X509_d2i(WOLFSSL_X509** x509, const byte* in, int len)
newX509 = (WOLFSSL_X509*)XMALLOC(sizeof(WOLFSSL_X509), NULL, newX509 = (WOLFSSL_X509*)XMALLOC(sizeof(WOLFSSL_X509), NULL,
DYNAMIC_TYPE_X509); DYNAMIC_TYPE_X509);
if (newX509 != NULL) { if (newX509 != NULL) {
XMEMSET(newX509, 0, sizeof(WOLFSSL_X509));
InitX509(newX509, 1, NULL); InitX509(newX509, 1, NULL);
if (CopyDecodedToX509(newX509, cert) != 0) { if (CopyDecodedToX509(newX509, cert) != 0) {
XFREE(newX509, NULL, DYNAMIC_TYPE_X509); wolfSSL_X509_free(newX509);
newX509 = NULL; newX509 = NULL;
} }
} }
@@ -15187,9 +15188,10 @@ WOLFSSL_X509* wolfSSL_X509_load_certificate_buffer(
x509 = (WOLFSSL_X509*)XMALLOC(sizeof(WOLFSSL_X509), NULL, x509 = (WOLFSSL_X509*)XMALLOC(sizeof(WOLFSSL_X509), NULL,
DYNAMIC_TYPE_X509); DYNAMIC_TYPE_X509);
if (x509 != NULL) { if (x509 != NULL) {
XMEMSET(x509, 0, sizeof(WOLFSSL_X509));
InitX509(x509, 1, NULL); InitX509(x509, 1, NULL);
if (CopyDecodedToX509(x509, cert) != 0) { if (CopyDecodedToX509(x509, cert) != 0) {
XFREE(x509, NULL, DYNAMIC_TYPE_X509); wolfSSL_X509_free(x509);
x509 = NULL; x509 = NULL;
} }
} }
@@ -28368,11 +28370,12 @@ WOLFSSL_X509* wolfSSL_get_chain_X509(WOLFSSL_X509_CHAIN* chain, int idx)
WOLFSSL_MSG("Failed alloc X509"); WOLFSSL_MSG("Failed alloc X509");
} }
else { else {
XMEMSET(x509, 0, sizeof(WOLFSSL_X509));
InitX509(x509, 1, NULL); InitX509(x509, 1, NULL);
if ((ret = CopyDecodedToX509(x509, cert)) != 0) { if ((ret = CopyDecodedToX509(x509, cert)) != 0) {
WOLFSSL_MSG("Failed to copy decoded"); WOLFSSL_MSG("Failed to copy decoded");
XFREE(x509, NULL, DYNAMIC_TYPE_X509); wolfSSL_X509_free(x509);
x509 = NULL; x509 = NULL;
} }
} }