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

Merge pull request #795 from JacobBarthelmeh/Testing

Browse Source 
bounds checking with adding string terminating character
This commit is contained in:
toddouska
2017-03-17 12:07:55 -07:00
committed by GitHub
parent db526999c3 0ef1b5d298
commit ad57738cc6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@ -1063,12 +1063,12 @@ static int ImportPeerInfo(WOLFSSL* ssl, byte* buf, word32 len, byte ver)
/* import ip address idx, and ipSz are unsigned but cast for enum */
ato16(buf + idx, &ipSz); idx += DTLS_EXPORT_LEN;
if (ipSz > sizeof(ip) || (word16)(idx + ipSz + DTLS_EXPORT_LEN) > len) {
if (ipSz >= sizeof(ip) || (word16)(idx + ipSz + DTLS_EXPORT_LEN) > len) {
return BUFFER_E;
}
XMEMSET(ip, 0, sizeof(ip));
XMEMCPY(ip, buf + idx, ipSz); idx += ipSz;
ip[ipSz] = '\0';
ip[ipSz] = '\0'; /* with check that ipSz less than ip this is valid */
ato16(buf + idx, &port); idx += DTLS_EXPORT_LEN;
/* sanity check for a function to call, then use it to import peer info */

6
src/ssl.c
View File

@ -12832,8 +12832,10 @@ static void ExternalFreeX509(WOLFSSL_X509* x509)
if (buf != NULL && text != NULL) {
textSz = min(textSz, len);
XMEMCPY(buf, text, textSz);
buf[textSz] = '\0';
if (textSz > 0) {
XMEMCPY(buf, text, textSz - 1);
buf[textSz - 1] = '\0';
}
}
WOLFSSL_LEAVE("wolfSSL_X509_NAME_get_text_by_NID", textSz);