wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6484 from JacobBarthelmeh/cov

Browse Source 
coverity scan fixes
This commit is contained in:
Sean Parkinson
2023-06-08 10:06:18 +10:00
committed by GitHub
parent c040b4a339 4a4a769512
commit 66d222adfc
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/bio.c
View File

@@ -2375,6 +2375,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
if (err == 1) { if (err == 1) {
wolfSSL_free(ssl); wolfSSL_free(ssl);
wolfSSL_BIO_free(sslBio); wolfSSL_BIO_free(sslBio);
sslBio = NULL;
wolfSSL_BIO_free(connBio); wolfSSL_BIO_free(connBio);
} }

3
src/pk.c
View File

@@ -360,8 +360,7 @@ static int der_to_enc_pem_alloc(unsigned char* der, int derSz,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
if (tmpBuf == NULL) { if (tmpBuf == NULL) {
WOLFSSL_ERROR_MSG("Extending DER buffer failed"); WOLFSSL_ERROR_MSG("Extending DER buffer failed");
XFREE(der, NULL, DYNAMIC_TYPE_TMP_BUFFER); ret = 0; /* der buffer is free'd at the end of the function */
ret = 0;
} }
else { else {
der = tmpBuf; der = tmpBuf;

32
src/x509.c
View File

@@ -223,9 +223,26 @@ WOLFSSL_X509_EXTENSION* wolfSSL_X509_EXTENSION_new(void)
return newExt; return newExt;
} }
/* Clear out and free internal pointers of ASN.1 STRING object.
*
* @param [in] asn1 ASN.1 STRING object.
*/
static void wolfSSL_ASN1_STRING_clear(WOLFSSL_ASN1_STRING* asn1)
{
/* Check we have an object to free. */
if (asn1 != NULL) {
/* Dispose of dynamic data. */
if ((asn1->length > 0) && asn1->isDynamic) {
XFREE(asn1->data, NULL, DYNAMIC_TYPE_OPENSSL);
}
XMEMSET(asn1, 0, sizeof(WOLFSSL_ASN1_STRING));
}
}
void wolfSSL_X509_EXTENSION_free(WOLFSSL_X509_EXTENSION* x) void wolfSSL_X509_EXTENSION_free(WOLFSSL_X509_EXTENSION* x)
{ {
WOLFSSL_ASN1_STRING asn1;
WOLFSSL_ENTER("wolfSSL_X509_EXTENSION_free"); WOLFSSL_ENTER("wolfSSL_X509_EXTENSION_free");
if (x == NULL) if (x == NULL)
return; return;
@@ -234,10 +251,7 @@ void wolfSSL_X509_EXTENSION_free(WOLFSSL_X509_EXTENSION* x)
wolfSSL_ASN1_OBJECT_free(x->obj); wolfSSL_ASN1_OBJECT_free(x->obj);
} }
asn1 = x->value; wolfSSL_ASN1_STRING_clear(&x->value);
if (asn1.length > 0 && asn1.data != NULL && asn1.isDynamic)
XFREE(asn1.data, NULL, DYNAMIC_TYPE_OPENSSL);
wolfSSL_sk_pop_free(x->ext_sk, NULL); wolfSSL_sk_pop_free(x->ext_sk, NULL);
XFREE(x, NULL, DYNAMIC_TYPE_X509_EXT); XFREE(x, NULL, DYNAMIC_TYPE_X509_EXT);
@@ -304,7 +318,7 @@ WOLFSSL_X509_EXTENSION* wolfSSL_X509_EXTENSION_create_by_OBJ(
/* Prevent potential memory leaks and dangling pointers. */ /* Prevent potential memory leaks and dangling pointers. */
wolfSSL_ASN1_OBJECT_free(ret->obj); wolfSSL_ASN1_OBJECT_free(ret->obj);
ret->obj = NULL; ret->obj = NULL;
wolfSSL_ASN1_STRING_free(&ret->value); wolfSSL_ASN1_STRING_clear(&ret->value);
} }
if (err == 0) { if (err == 0) {
@@ -586,6 +600,7 @@ static int wolfssl_dns_entry_othername_to_gn(DNS_entry* dns,
/* Next is: [0]. Check tag and length. */ /* Next is: [0]. Check tag and length. */
if (GetASNTag(p, &idx, &tag, (word32)len) < 0) { if (GetASNTag(p, &idx, &tag, (word32)len) < 0) {
wolfSSL_ASN1_OBJECT_free(obj);
goto err; goto err;
} }
if (tag != (ASN_CONTEXT_SPECIFIC | ASN_CONSTRUCTED | 0)) { if (tag != (ASN_CONTEXT_SPECIFIC | ASN_CONSTRUCTED | 0)) {
@@ -1218,6 +1233,7 @@ WOLFSSL_X509_EXTENSION* wolfSSL_X509_set_ext(WOLFSSL_X509* x509, int loc)
x509->ext_sk = wolfSSL_sk_new_x509_ext(); x509->ext_sk = wolfSSL_sk_new_x509_ext();
if (wolfSSL_sk_X509_EXTENSION_push(x509->ext_sk, ext) == WOLFSSL_FAILURE) { if (wolfSSL_sk_X509_EXTENSION_push(x509->ext_sk, ext) == WOLFSSL_FAILURE) {
wolfSSL_X509_EXTENSION_free(ext); wolfSSL_X509_EXTENSION_free(ext);
ext = NULL;
} }
FreeDecodedCert(cert); FreeDecodedCert(cert);
@@ -13949,7 +13965,9 @@ int wolfSSL_X509_REQ_add1_attr_by_NID(WOLFSSL_X509 *req,
else { else {
if (req->reqAttributes == NULL) { if (req->reqAttributes == NULL) {
req->reqAttributes = wolfSSL_sk_new_node(req->heap); req->reqAttributes = wolfSSL_sk_new_node(req->heap);
req->reqAttributes->type = STACK_TYPE_X509_REQ_ATTR; if (req->reqAttributes != NULL) {
req->reqAttributes->type = STACK_TYPE_X509_REQ_ATTR;
}
} }
ret = wolfSSL_sk_push(req->reqAttributes, attr); ret = wolfSSL_sk_push(req->reqAttributes, attr);
} }

4
wolfcrypt/src/asn.c
View File

@@ -16694,8 +16694,8 @@ static int DecodeSEP(ASNGetData* dataASN, DecodedCert* cert)
cert->hwTypeSz = (int)oidLen; cert->hwTypeSz = (int)oidLen;
/* TODO: check this is the HW serial number OID - no test data. */ /* TODO: check this is the HW serial number OID - no test data. */
/* Allocate space for HW serial number. */ /* Allocate space for HW serial number, +1 for null terminator. */
cert->hwSerialNum = (byte*)XMALLOC(serialLen, cert->heap, cert->hwSerialNum = (byte*)XMALLOC(serialLen + 1, cert->heap,
DYNAMIC_TYPE_X509_EXT); DYNAMIC_TYPE_X509_EXT);
if (cert->hwSerialNum == NULL) { if (cert->hwSerialNum == NULL) {
WOLFSSL_MSG("\tOut of Memory"); WOLFSSL_MSG("\tOut of Memory");