mirror of https://github.com/wolfSSL/wolfssl.git
F-5727 - Guard asn1App_ReadFile reallocation size against word32 overflow
parent
600ccadf59
commit
4d629563ad
|
|
@ -98,13 +98,20 @@ static int asn1App_ReadFile(FILE* fp, unsigned char** pdata, word32* plen)
|
|||
/* Add read data amount to length. */
|
||||
len += (word32)read_len;
|
||||
|
||||
/* Stop before the length or reallocation size can wrap word32. */
|
||||
if (len > (word32)(0xFFFFFFFFU - DATA_INC_LEN)) {
|
||||
XFREE(data, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
||||
data = NULL;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Stop if we are at end-of-file. */
|
||||
if (feof(fp)) {
|
||||
break;
|
||||
}
|
||||
|
||||
/* Make space for more data to be added to buffer. */
|
||||
p = (unsigned char*)XREALLOC(data, len + DATA_INC_LEN, NULL,
|
||||
p = (unsigned char*)XREALLOC(data, (size_t)len + DATA_INC_LEN, NULL,
|
||||
DYNAMIC_TYPE_TMP_BUFFER);
|
||||
if (p == NULL) {
|
||||
/* Reallocation failed - free current buffer. */
|
||||
|
|
|
|||
Loading…
Reference in New Issue