wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3145 from JacobBarthelmeh/Compatibility-Layer

Browse Source 
sanity check on return value for wolfSSL_X509_NAME_ENTRY_get_object
This commit is contained in:
David Garske
2020-07-17 15:05:25 -07:00
committed by GitHub
parent 4ff6b6a908 01a01c373f
commit 080ccd9820
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@ -37974,6 +37974,9 @@ err:
e = &name->entry[i]; e = &name->entry[i];
obj = wolfSSL_X509_NAME_ENTRY_get_object(e); obj = wolfSSL_X509_NAME_ENTRY_get_object(e);
if (obj == NULL) {
return BAD_FUNC_ARG;
}
XMEMCPY(fullName + *idx, "/", 1); *idx = *idx + 1; XMEMCPY(fullName + *idx, "/", 1); *idx = *idx + 1;
sz = (int)XSTRLEN(obj->sName); sz = (int)XSTRLEN(obj->sName);
@ -38011,6 +38014,8 @@ err:
e = &name->entry[i]; e = &name->entry[i];
obj = wolfSSL_X509_NAME_ENTRY_get_object(e); obj = wolfSSL_X509_NAME_ENTRY_get_object(e);
if (obj == NULL)
return BAD_FUNC_ARG;
totalLen += (int)XSTRLEN(obj->sName) + 2;/*+2 for '/' and '=' */ totalLen += (int)XSTRLEN(obj->sName) + 2;/*+2 for '/' and '=' */
totalLen += wolfSSL_ASN1_STRING_length(e->value); totalLen += wolfSSL_ASN1_STRING_length(e->value);
@ -38022,8 +38027,11 @@ err:
return MEMORY_E; return MEMORY_E;
idx = 0; idx = 0;
entryCount = 0; entryCount = AddAllEntry(name, fullName, totalLen, &idx);
entryCount += AddAllEntry(name, fullName, totalLen, &idx); if (entryCount < 0) {
XFREE(fullName, name->heap, DYNAMIC_TYPE_X509);
return entryCount;
}
if (name->dynamicName) { if (name->dynamicName) {
XFREE(name->name, name->heap, DYNAMIC_TYPE_X509); XFREE(name->name, name->heap, DYNAMIC_TYPE_X509);