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

Fix scan-build not recognizing FlatAttrib array being initialized

Browse Source
This commit is contained in:
Aaron Jense
2019-11-13 11:50:26 -07:00
parent e2b7bee9c8
commit 0beeb2356b
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;