Merge pull request #973 from JacobBarthelmeh/Testing

add sanity check for wolfSSL_X509_NAME_oneline function
This commit is contained in:
dgarske
2017-06-16 10:54:02 -07:00
committed by GitHub

View File

@@ -13523,7 +13523,14 @@ static void ExternalFreeX509(WOLFSSL_X509* x509)
malloc buffer, call responsible for freeing */ malloc buffer, call responsible for freeing */
char* wolfSSL_X509_NAME_oneline(WOLFSSL_X509_NAME* name, char* in, int sz) char* wolfSSL_X509_NAME_oneline(WOLFSSL_X509_NAME* name, char* in, int sz)
{ {
int copySz = min(sz, name->sz); int copySz;
if (name == NULL) {
WOLFSSL_MSG("WOLFSSL_X509_NAME pointer was NULL");
return NULL;
}
copySz = min(sz, name->sz);
WOLFSSL_ENTER("wolfSSL_X509_NAME_oneline"); WOLFSSL_ENTER("wolfSSL_X509_NAME_oneline");
if (!name->sz) return in; if (!name->sz) return in;
@@ -13539,7 +13546,7 @@ static void ExternalFreeX509(WOLFSSL_X509* x509)
#endif #endif
} }
if (copySz == 0) if (copySz <= 0)
return in; return in;
XMEMCPY(in, name->name, copySz - 1); XMEMCPY(in, name->name, copySz - 1);