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

Merge pull request #4093 from guidovranken/DecodeResponseData-allocation-check

Browse Source 
ASN: Catch allocation failure in DecodeResponseData
This commit is contained in:
Sean Parkinson
2021-06-09 09:38:53 +10:00
committed by GitHub
parent 9580574382 bd7b57783d
commit 32c215775a
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wolfcrypt/src/asn.c
View File

@@ -16318,6 +16318,10 @@ static int ASNToHexString(const byte* input, word32* inOutIdx, char** out,
} }
str = (char*)XMALLOC(len * 2 + 1, heap, heapType); str = (char*)XMALLOC(len * 2 + 1, heap, heapType);
if (str == NULL) {
return MEMORY_E;
}
for (i=0; i<len; i++) for (i=0; i<len; i++)
ByteToHex(input[*inOutIdx + i], str + i*2); ByteToHex(input[*inOutIdx + i], str + i*2);
str[len*2] = '\0'; str[len*2] = '\0';
@@ -17624,12 +17628,20 @@ static int DecodeResponseData(byte* source,
if (single->next == NULL) { if (single->next == NULL) {
return MEMORY_E; return MEMORY_E;
} }
single = single->next; XMEMSET(single->next, 0, sizeof(OcspEntry));
XMEMSET(single, 0, sizeof(OcspEntry));
single->status = (CertStatus*)XMALLOC(sizeof(CertStatus), single->next->status = (CertStatus*)XMALLOC(sizeof(CertStatus),
resp->heap, DYNAMIC_TYPE_OCSP_STATUS); resp->heap, DYNAMIC_TYPE_OCSP_STATUS);
XMEMSET(single->status, 0, sizeof(CertStatus)); if (single->next->status == NULL) {
single->isDynamic = 1; XFREE(single->next, resp->heap, DYNAMIC_TYPE_OCSP_ENTRY);
single->next = NULL;
return MEMORY_E;
}
XMEMSET(single->next->status, 0, sizeof(CertStatus));
single->next->isDynamic = 1;
single = single->next;
} }
} }