wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove NULL test when there is a dereference

Browse Source
This commit is contained in:
Andras Fekete
2024-08-06 10:29:02 -04:00
parent d7a0f49906
commit eb0c64d79a
12 changed files with 29 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
IDE/Renesas/e2studio/RA6M4/test/src/test_main.c
View File

@@ -151,17 +151,11 @@ void Clr_CallbackCtx(FSPSM_ST *g)
(void) g;
#if defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)
if (g->wrapped_key_rsapri2048 != NULL)
XFREE(g->wrapped_key_rsapri2048,
NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(g->wrapped_key_rsapri2048, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (g->wrapped_key_rsapub2048 != NULL)
XFREE(g->wrapped_key_rsapub2048,
NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(g->wrapped_key_rsapub2048, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (g->wrapped_key_rsapri1024 != NULL)
XFREE(g->wrapped_key_rsapri1024,
NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(g->wrapped_key_rsapri1024, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (g->wrapped_key_rsapub2048 != NULL)
XFREE(g->wrapped_key_rsapub1024,

16
IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/wolfssl_tsip_unit_test.c
View File

@@ -107,21 +107,13 @@ typedef struct tagInfo
void Clr_CallbackCtx(TsipUserCtx *g)
{
if (g->rsa1024pri_keyIdx != NULL)
XFREE(g->rsa1024pri_keyIdx,
NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(g->rsa1024pri_keyIdx, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (g->rsa1024pub_keyIdx != NULL)
XFREE(g->rsa1024pub_keyIdx,
NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(g->rsa1024pub_keyIdx, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (g->rsa2048pri_keyIdx != NULL)
XFREE(g->rsa2048pri_keyIdx,
NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(g->rsa2048pri_keyIdx, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (g->rsa2048pub_keyIdx != NULL)
XFREE(g->rsa2048pub_keyIdx,
NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(g->rsa2048pub_keyIdx, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XMEMSET(g, 0, sizeof(TsipUserCtx));
}

6
src/conf.c
View File

@@ -982,13 +982,11 @@ void wolfSSL_X509V3_conf_free(WOLFSSL_CONF_VALUE *val)
if (val->name) {
/* Not a section. Don't free section as it is a shared pointer. */
XFREE(val->name, NULL, DYNAMIC_TYPE_OPENSSL);
if (val->value)
XFREE(val->value, NULL, DYNAMIC_TYPE_OPENSSL);
XFREE(val->value, NULL, DYNAMIC_TYPE_OPENSSL);
}
else {
/* Section so val->value is a stack */
if (val->section)
XFREE(val->section, NULL, DYNAMIC_TYPE_OPENSSL);
XFREE(val->section, NULL, DYNAMIC_TYPE_OPENSSL);
/* Only free the stack structures. The contained conf values
* will be freed in wolfSSL_NCONF_free */
sk = (WOLF_STACK_OF(WOLFSSL_CONF_VALUE)*)val->value;

9
src/crl.c
View File

@@ -219,13 +219,10 @@ static void CRL_Entry_free(CRL_Entry* crle, void* heap)
tmp = next;
}
#endif
if (crle->signature != NULL)
XFREE(crle->signature, heap, DYNAMIC_TYPE_CRL_ENTRY);
if (crle->toBeSigned != NULL)
XFREE(crle->toBeSigned, heap, DYNAMIC_TYPE_CRL_ENTRY);
XFREE(crle->signature, heap, DYNAMIC_TYPE_CRL_ENTRY);
XFREE(crle->toBeSigned, heap, DYNAMIC_TYPE_CRL_ENTRY);
#ifdef WC_RSA_PSS
if (crle->sigParams != NULL)
XFREE(crle->sigParams, heap, DYNAMIC_TYPE_CRL_ENTRY);
XFREE(crle->sigParams, heap, DYNAMIC_TYPE_CRL_ENTRY);
#endif
#if defined(OPENSSL_EXTRA)
if (crle->issuer != NULL) {

6
src/dtls.c
View File

@@ -1150,10 +1150,8 @@ void TLSX_ConnectionID_Free(byte* ext, void* heap)
info = DtlsCidGetInfoFromExt(ext);
if (info == NULL)
return;
if (info->rx != NULL)
XFREE(info->rx, heap, DYNAMIC_TYPE_TLSX);
if (info->tx != NULL)
XFREE(info->tx, heap, DYNAMIC_TYPE_TLSX);
XFREE(info->rx, heap, DYNAMIC_TYPE_TLSX);
XFREE(info->tx, heap, DYNAMIC_TYPE_TLSX);
XFREE(info, heap, DYNAMIC_TYPE_TLSX);
DtlsCidUnsetInfoFromExt(ext);
XFREE(ext, heap, DYNAMIC_TYPE_TLSX);

6
src/internal.c
View File

@@ -2576,8 +2576,7 @@ static void FreeEchConfigs(WOLFSSL_EchConfig* configs, void* heap)
XFREE(working_config->cipherSuites, heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(working_config->publicName, heap, DYNAMIC_TYPE_TMP_BUFFER);
if (working_config->raw != NULL)
XFREE(working_config->raw, heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(working_config->raw, heap, DYNAMIC_TYPE_TMP_BUFFER);
if (working_config->receiverPrivkey != NULL) {
wc_HpkeFreeKey(NULL, working_config->kemId,
@@ -8921,8 +8920,7 @@ void DtlsMsgDelete(DtlsMsg* item, void* heap)
DtlsMsgDestroyFragBucket(item->fragBucketList, heap);
item->fragBucketList = next;
}
if (item->raw != NULL)
XFREE(item->raw, heap, DYNAMIC_TYPE_DTLS_FRAG);
XFREE(item->raw, heap, DYNAMIC_TYPE_DTLS_FRAG);
XFREE(item, heap, DYNAMIC_TYPE_DTLS_MSG);
}
}

6
src/ocsp.c
View File

@@ -90,8 +90,7 @@ static void FreeOcspEntry(OcspEntry* entry, void* heap)
for (status = entry->status; status; status = next) {
next = status->next;
if (status->rawOcspResponse)
XFREE(status->rawOcspResponse, heap, DYNAMIC_TYPE_OCSP_STATUS);
XFREE(status->rawOcspResponse, heap, DYNAMIC_TYPE_OCSP_STATUS);
#ifdef OPENSSL_EXTRA
if (status->serialInt) {
@@ -927,8 +926,7 @@ void wolfSSL_OCSP_RESPONSE_free(OcspResponse* response)
XFREE(response->single, NULL, DYNAMIC_TYPE_OCSP_ENTRY);
}
if (response->source != NULL)
XFREE(response->source, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(response->source, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(response, NULL, DYNAMIC_TYPE_OCSP_REQUEST);
}

3
src/sniffer.c
View File

@@ -851,8 +851,7 @@ static void FreeSnifferSession(SnifferSession* session)
XFREE(session->hash, NULL, DYNAMIC_TYPE_HASHES);
#endif
#ifdef WOLFSSL_TLS13
if (session->cliKeyShare)
XFREE(session->cliKeyShare, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(session->cliKeyShare, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
#ifdef HAVE_MAX_FRAGMENT
if (session->tlsFragBuf) {

3
src/ssl_p7p12.c
View File

@@ -94,8 +94,7 @@ void wolfSSL_PKCS7_free(PKCS7* pkcs7)
WOLFSSL_PKCS7* p7 = (WOLFSSL_PKCS7*)pkcs7;
if (p7 != NULL) {
if (p7->data != NULL)
XFREE(p7->data, NULL, DYNAMIC_TYPE_PKCS7);
XFREE(p7->data, NULL, DYNAMIC_TYPE_PKCS7);
wc_PKCS7_Free(&p7->pkcs7);
if (p7->certs)
wolfSSL_sk_pop_free(p7->certs, NULL);

9
src/tls.c
View File

@@ -2682,8 +2682,7 @@ static void TLSX_TCA_Free(TCA* tca, void* heap)
(void)heap;
if (tca) {
if (tca->id)
XFREE(tca->id, heap, DYNAMIC_TYPE_TLSX);
XFREE(tca->id, heap, DYNAMIC_TYPE_TLSX);
XFREE(tca, heap, DYNAMIC_TYPE_TLSX);
}
}
@@ -12261,13 +12260,11 @@ static int TLSX_ECH_Parse(WOLFSSL* ssl, const byte* readBuf, word16 size,
/* free the ech struct and the dynamic buffer it uses */
static void TLSX_ECH_Free(WOLFSSL_ECH* ech, void* heap)
{
if (ech->innerClientHello != NULL)
XFREE(ech->innerClientHello, heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(ech->innerClientHello, heap, DYNAMIC_TYPE_TMP_BUFFER);
if (ech->ephemeralKey != NULL)
wc_HpkeFreeKey(ech->hpke, ech->hpke->kem, ech->ephemeralKey,
ech->hpke->heap);
if (ech->hpke != NULL)
XFREE(ech->hpke, heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(ech->hpke, heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(ech, heap, DYNAMIC_TYPE_TMP_BUFFER);
(void)heap;

3
wolfcrypt/src/asn.c
View File

@@ -37718,8 +37718,7 @@ void FreeDecodedCRL(DecodedCRL* dcrl)
tmp = next;
}
#ifdef OPENSSL_EXTRA
if (dcrl->issuer != NULL)
XFREE(dcrl->issuer, NULL, DYNAMIC_TYPE_OPENSSL);
XFREE(dcrl->issuer, NULL, DYNAMIC_TYPE_OPENSSL);
#endif
}

15
wolfcrypt/src/ecc.c
View File

@@ -3653,17 +3653,12 @@ static void ecc_key_tmp_final(ecc_key* key, void* heap)
FREE_MP_INT_SIZE(key->t1, heap, DYNAMIC_TYPE_ECC);
#else
#ifdef ALT_ECC_SIZE
if (key->z != NULL)
XFREE(key->z, heap, DYNAMIC_TYPE_ECC);
if (key->y != NULL)
XFREE(key->y, heap, DYNAMIC_TYPE_ECC);
if (key->x != NULL)
XFREE(key->x, heap, DYNAMIC_TYPE_ECC);
XFREE(key->z, heap, DYNAMIC_TYPE_ECC);
XFREE(key->y, heap, DYNAMIC_TYPE_ECC);
XFREE(key->x, heap, DYNAMIC_TYPE_ECC);
#endif
if (key->t2 != NULL)
XFREE(key->t2, heap, DYNAMIC_TYPE_ECC);
if (key->t1 != NULL)
XFREE(key->t1, heap, DYNAMIC_TYPE_ECC);
XFREE(key->t2, heap, DYNAMIC_TYPE_ECC);
XFREE(key->t1, heap, DYNAMIC_TYPE_ECC);
#endif
}
#endif /* WOLFSSL_SMALL_STACK_CACHE */