WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8449 from ColtonWilley/x509_store_mem_leak 

Fix memory leak in X509 STORE
pull/8451/head
David Garske 2025-02-13 16:18:11 -08:00 committed by GitHub
parent 746aa9b171 e197cdfb36
commit 1432bd415a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/x509_str.c
View File

@ -1477,7 +1477,6 @@ int X509StoreLoadCertBuffer(WOLFSSL_X509_STORE *str,
byte *buf, word32 bufLen, int type) byte *buf, word32 bufLen, int type)
{ {
int ret = WOLFSSL_SUCCESS; int ret = WOLFSSL_SUCCESS;
WOLFSSL_X509 *x509 = NULL; WOLFSSL_X509 *x509 = NULL;
if (str == NULL || buf == NULL) { if (str == NULL || buf == NULL) {
@ -1486,20 +1485,25 @@ int X509StoreLoadCertBuffer(WOLFSSL_X509_STORE *str,
/* OpenSSL X509_STORE_load_file fails on DER file, we will as well */ /* OpenSSL X509_STORE_load_file fails on DER file, we will as well */
x509 = wolfSSL_X509_load_certificate_buffer(buf, bufLen, type); x509 = wolfSSL_X509_load_certificate_buffer(buf, bufLen, type);
if (str->owned != NULL) { if (x509 != NULL) {
if (wolfSSL_sk_X509_push(str->owned, x509) <= 0) { ret = wolfSSL_X509_STORE_add_cert(str, x509);
if (ret != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("Failed to load file");
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
} }
} if (ret == WOLFSSL_SUCCESS && str->owned != NULL) {
if (ret == WOLFSSL_SUCCESS) { if (wolfSSL_sk_X509_push(str->owned, x509) <= 0) {
ret = wolfSSL_X509_STORE_add_cert(str, x509); ret = WOLFSSL_FAILURE;
} }
if (ret != WOLFSSL_SUCCESS) { else {
WOLFSSL_MSG("Failed to load file"); x509 = NULL;
ret = WOLFSSL_FAILURE; }
} }
if (ret != WOLFSSL_SUCCESS || str->owned == NULL) {
wolfSSL_X509_free(x509); wolfSSL_X509_free(x509);
}
else {
ret = WOLFSSL_FAILURE;
} }
return ret; return ret;