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

Merge pull request #4013 from kabuobeid/smime_fixes

Browse Source 
S/MIME: Fix issue with canonSection size when adding newlines.
This commit is contained in:
David Garske
2021-05-07 13:12:54 -07:00
committed by GitHub
parent 28e2d68677 62bb0a8527
commit aa3f9f8459
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@@ -54457,6 +54457,7 @@ WOLFSSL_API PKCS7* wolfSSL_SMIME_read_PKCS7(WOLFSSL_BIO* in,
int lineLen = 0; int lineLen = 0;
int remainLen = 0; int remainLen = 0;
byte isEnd = 0; byte isEnd = 0;
size_t canonSize = 0;
size_t boundLen = 0; size_t boundLen = 0;
char* boundary = NULL; char* boundary = NULL;
@@ -54554,7 +54555,8 @@ WOLFSSL_API PKCS7* wolfSSL_SMIME_read_PKCS7(WOLFSSL_BIO* in,
section[0] = '\0'; section[0] = '\0';
sectionLen = 0; sectionLen = 0;
canonSection = (char*)XMALLOC(remainLen+1, NULL, canonSize = remainLen + 1;
canonSection = (char*)XMALLOC(canonSize, NULL,
DYNAMIC_TYPE_PKCS7); DYNAMIC_TYPE_PKCS7);
if (canonSection == NULL) { if (canonSection == NULL) {
goto error; goto error;
@@ -54567,6 +54569,16 @@ WOLFSSL_API PKCS7* wolfSSL_SMIME_read_PKCS7(WOLFSSL_BIO* in,
if (canonLine == NULL) { if (canonLine == NULL) {
goto error; goto error;
} }
/* If line endings were added, the initial length may be
* exceeded. */
if ((canonPos + XSTRLEN(canonLine) + 1) >= canonSize) {
canonSize = canonPos + XSTRLEN(canonLine) + 1;
canonSection = XREALLOC(canonSection, canonSize, NULL,
DYNAMIC_TYPE_PKCS7);
if (canonSection == NULL) {
goto error;
}
}
XMEMCPY(&canonSection[canonPos], canonLine, XMEMCPY(&canonSection[canonPos], canonLine,
(int)XSTRLEN(canonLine)); (int)XSTRLEN(canonLine));
canonPos += XSTRLEN(canonLine); canonPos += XSTRLEN(canonLine);