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

Merge pull request #8341 from douzzer/20250108-PKCS12_CoalesceOctetStrings-leak 

20250108-PKCS12_CoalesceOctetStrings-leak
pull/8342/head
David Garske 2025-01-08 12:29:30 -08:00 committed by GitHub
parent 78776ba6b3 8d85ab964d
commit 5f95fe3730
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/pkcs12.c
View File

@ -1277,11 +1277,11 @@ static int PKCS12_CoalesceOctetStrings(WC_PKCS12* pkcs12, byte* data,
if (mergedSz > 0) {
/* Copy over concatenated octet strings into data buffer */
XMEMCPY(&data[*idx], mergedData, mergedSz);
XFREE(mergedData, pkcs12->heap, DYNAMIC_TYPE_PKCS);
}
}
XFREE(mergedData, pkcs12->heap, DYNAMIC_TYPE_PKCS);
return ret;
}
#endif