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

Merge pull request #2567 from aaronjense/scan-build-fix

Browse Source 
Scan-Build Fixes for PKCS7 and PKCS12
This commit is contained in:
JacobBarthelmeh
2019-11-18 10:21:14 -07:00
committed by GitHub
parent ea04dbede1 dab7d09570
commit c9f7741dfb
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/pkcs12.c
View File

@ -1070,7 +1070,7 @@ int wc_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw,
ERROR_OUT(ASN_PARSE_E, exit_pk12par); ERROR_OUT(ASN_PARSE_E, exit_pk12par);
} }
if ((ret = GetLength(data, &idx, &size, ci->dataSz)) <= 0) { if ((ret = GetLength(data, &idx, &size, ci->dataSz)) <= 0) {
goto exit_pk12par; ERROR_OUT(ASN_PARSE_E, exit_pk12par);
} }
if (GetASNTag(data, &idx, &tag, ci->dataSz) < 0) { if (GetASNTag(data, &idx, &tag, ci->dataSz) < 0) {

18
wolfcrypt/src/pkcs7.c
View File

@ -1390,6 +1390,19 @@ typedef struct FlatAttrib {
word32 dataSz; word32 dataSz;
} FlatAttrib; } FlatAttrib;
/* Returns a pointer to FlatAttrib whose members are initialized to 0.
* Caller is expected to free.
*/
static FlatAttrib* NewAttrib(void* heap)
{
FlatAttrib* fb = (FlatAttrib*) XMALLOC(sizeof(FlatAttrib), heap,
DYNAMIC_TYPE_TMP_BUFFER);
if (fb != NULL) {
ForceZero(fb, sizeof(FlatAttrib));
}
(void)heap;
return fb;
}
/* Free FlatAttrib array and memory allocated to internal struct members */ /* Free FlatAttrib array and memory allocated to internal struct members */
static void FreeAttribArray(PKCS7* pkcs7, FlatAttrib** arr, int rows) static void FreeAttribArray(PKCS7* pkcs7, FlatAttrib** arr, int rows)
@ -1513,11 +1526,10 @@ static int FlattenAttributes(PKCS7* pkcs7, byte* output, EncodedAttrib* ea,
if (derArr == NULL) { if (derArr == NULL) {
return MEMORY_E; return MEMORY_E;
} }
ForceZero(derArr, eaSz * sizeof(FlatAttrib*)); XMEMSET(derArr, 0, eaSz * sizeof(FlatAttrib*));
for (i = 0; i < eaSz; i++) { for (i = 0; i < eaSz; i++) {
derArr[i] = (FlatAttrib*) XMALLOC(sizeof(FlatAttrib), pkcs7->heap, derArr[i] = NewAttrib(pkcs7->heap);
DYNAMIC_TYPE_TMP_BUFFER);
if (derArr[i] == NULL) { if (derArr[i] == NULL) {
FreeAttribArray(pkcs7, derArr, eaSz); FreeAttribArray(pkcs7, derArr, eaSz);
return MEMORY_E; return MEMORY_E;