Skip to content

Commit d6a7187

Browse files
author
Andras Fekete
committed
Programmatically remove NULL test with { XFREE() }
1 parent 208f2d6 commit d6a7187

37 files changed

Lines changed: 175 additions & 529 deletions

‎IDE/Renesas/e2studio/RA6M4/test/src/wolfssl_sce_unit_test.c‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -691,18 +691,10 @@ static int sce_rsa_test(int prnt, int keySize)
691691
wc_FreeRsaKey(key);
692692
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
693693
}
694-
if (in != NULL) {
695-
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
696-
}
697-
if (in2 != NULL) {
698-
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
699-
}
700-
if (out != NULL) {
701-
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
702-
}
703-
if (out2 != NULL) {
704-
XFREE(out2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
705-
}
694+
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
695+
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
696+
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
697+
XFREE(out2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
706698

707699
return ret;
708700
}
@@ -778,15 +770,9 @@ static int sce_rsa_SignVerify_test(int prnt, int keySize)
778770
wc_FreeRsaKey(key);
779771
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
780772
}
781-
if (in != NULL) {
782-
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
783-
}
784-
if (in2 != NULL) {
785-
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
786-
}
787-
if (out != NULL) {
788-
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
789-
}
773+
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
774+
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
775+
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
790776

791777
return ret;
792778
}

‎IDE/Renesas/e2studio/RX72N/EnvisionKit/wolfssl_demo/wolfssl_tsip_unit_test.c‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -781,15 +781,9 @@ static int tsip_rsa_SignVerify_test(int prnt, int keySize)
781781
wc_FreeRsaKey(key);
782782
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
783783
}
784-
if (in != NULL) {
785-
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
786-
}
787-
if (in2 != NULL) {
788-
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
789-
}
790-
if (out != NULL) {
791-
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
792-
}
784+
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
785+
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
786+
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
793787

794788
return ret;
795789
}

‎IDE/Renesas/e2studio/RZN2L/test/src/test/wolfssl_rsip_unit_test.c‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -718,18 +718,10 @@ static int rsip_rsa_test(int prnt, int keySize)
718718
wc_FreeRsaKey(key);
719719
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
720720
}
721-
if (in != NULL) {
722-
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
723-
}
724-
if (in2 != NULL) {
725-
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
726-
}
727-
if (out != NULL) {
728-
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
729-
}
730-
if (out2 != NULL) {
731-
XFREE(out2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
732-
}
721+
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
722+
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
723+
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
724+
XFREE(out2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
733725

734726
(void) prnt;
735727
return ret;
@@ -808,15 +800,9 @@ static int rsip_rsa_SignVerify_test(int prnt, int keySize)
808800
wc_FreeRsaKey(key);
809801
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
810802
}
811-
if (in != NULL) {
812-
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
813-
}
814-
if (in2 != NULL) {
815-
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
816-
}
817-
if (out != NULL) {
818-
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
819-
}
803+
XFREE(in, NULL, DYNAMIC_TYPE_TMP_BUFFER);
804+
XFREE(in2, NULL, DYNAMIC_TYPE_TMP_BUFFER);
805+
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
820806

821807
return ret;
822808
}

‎IDE/STM32Cube/wolfssl_example.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,9 +1700,7 @@ static int tls13_uart_server(void)
17001700
}
17011701

17021702
#ifdef WOLFSSL_SMALL_STACK
1703-
if (tbuf != NULL) {
1704-
XFREE(tbuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1705-
}
1703+
XFREE(tbuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
17061704
#endif
17071705

17081706
return ret;
@@ -1795,9 +1793,7 @@ static int tls13_uart_client(void)
17951793
wolfSSL_CTX_free(ctx);
17961794
}
17971795
#ifdef WOLFSSL_SMALL_STACK
1798-
if (tbuf != NULL) {
1799-
XFREE(tbuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1800-
}
1796+
XFREE(tbuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
18011797
#endif
18021798

18031799
return ret;

‎src/internal.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13952,9 +13952,7 @@ int LoadCertByIssuer(WOLFSSL_X509_STORE* store, X509_NAME* issuer, int type)
1395213952
/* / <hashvalue>.(r)N\0 */
1395313953
/*|1| 8 |1|1|1|1| => 13 */
1395413954
len = (int)XSTRLEN(entry->dir_name) + 13;
13955-
if (filename != NULL) {
13956-
XFREE(filename, NULL, DYNAMIC_TYPE_OPENSSL);
13957-
}
13955+
XFREE(filename, NULL, DYNAMIC_TYPE_OPENSSL);
1395813956

1395913957
filename = (char*)XMALLOC(len, NULL, DYNAMIC_TYPE_OPENSSL);
1396013958
if (filename == NULL) {
@@ -41182,9 +41180,7 @@ void wolfSSL_BY_DIR_entry_free(WOLFSSL_BY_DIR_entry* entry)
4118241180
wolfSSL_sk_BY_DIR_HASH_free(entry->hashes);
4118341181
}
4118441182

41185-
if (entry->dir_name != NULL) {
41186-
XFREE(entry->dir_name, NULL, DYNAMIC_TYPE_OPENSSL);
41187-
}
41183+
XFREE(entry->dir_name, NULL, DYNAMIC_TYPE_OPENSSL);
4118841184

4118941185
XFREE(entry, NULL, DYNAMIC_TYPE_OPENSSL);
4119041186
}

‎src/pk.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7799,9 +7799,7 @@ static int wolfssl_dhparams_to_der(WOLFSSL_DH* dh, unsigned char** out,
77997799
*out = der;
78007800
der = NULL;
78017801
}
7802-
if (der != NULL) {
7803-
XFREE(der, heap, DYNAMIC_TYPE_TMP_BUFFER);
7804-
}
7802+
XFREE(der, heap, DYNAMIC_TYPE_TMP_BUFFER);
78057803

78067804
return ret;
78077805
}

‎src/ssl.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,9 +1034,7 @@ WOLFSSL_CTX* wolfSSL_CTX_new_ex(WOLFSSL_METHOD* method, void* heap)
10341034
if (ret != WOLFSSL_SUCCESS) {
10351035
WOLFSSL_MSG("wolfSSL_Init failed");
10361036
WOLFSSL_LEAVE("wolfSSL_CTX_new_ex", 0);
1037-
if (method != NULL) {
1038-
XFREE(method, heap, DYNAMIC_TYPE_METHOD);
1039-
}
1037+
XFREE(method, heap, DYNAMIC_TYPE_METHOD);
10401038
return NULL;
10411039
}
10421040
}

‎src/ssl_asn1.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,9 +3002,7 @@ int wolfSSL_ASN1_STRING_print_ex(WOLFSSL_BIO *bio, WOLFSSL_ASN1_STRING *str,
30023002
void wolfSSL_ASN1_GENERALIZEDTIME_free(WOLFSSL_ASN1_TIME* asn1Time)
30033003
{
30043004
WOLFSSL_ENTER("wolfSSL_ASN1_GENERALIZEDTIME_free");
3005-
if (asn1Time != NULL) {
3006-
XFREE(asn1Time, NULL, DYNAMIC_TYPE_OPENSSL);
3007-
}
3005+
XFREE(asn1Time, NULL, DYNAMIC_TYPE_OPENSSL);
30083006
}
30093007

30103008
#ifndef NO_BIO

‎src/ssl_p7p12.c‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -625,9 +625,7 @@ static int wolfSSL_BIO_to_MIME_crlf(WOLFSSL_BIO* in, WOLFSSL_BIO* out)
625625
}
626626
}
627627

628-
if (canonLine != NULL) {
629-
XFREE(canonLine, NULL, DYNAMIC_TYPE_PKCS7);
630-
}
628+
XFREE(canonLine, NULL, DYNAMIC_TYPE_PKCS7);
631629
#ifdef WOLFSSL_SMALL_STACK
632630
XFREE(line, in->heap, DYNAMIC_TYPE_TMP_BUFFER);
633631
#endif
@@ -744,9 +742,7 @@ int wolfSSL_PKCS7_final(PKCS7* pkcs7, WOLFSSL_BIO* in, int flags)
744742
}
745743

746744
if (ret == 1) {
747-
if (p7->data != NULL) {
748-
XFREE(p7->data, NULL, DYNAMIC_TYPE_PKCS7);
749-
}
745+
XFREE(p7->data, NULL, DYNAMIC_TYPE_PKCS7);
750746
p7->data = (byte*)XMALLOC(memSz, NULL, DYNAMIC_TYPE_PKCS7);
751747
if (p7->data == NULL) {
752748
ret = 0;
@@ -1603,12 +1599,8 @@ int wolfSSL_SMIME_write_PKCS7(WOLFSSL_BIO* out, PKCS7* pkcs7, WOLFSSL_BIO* in,
16031599
}
16041600
}
16051601

1606-
if (p7out != NULL) {
1607-
XFREE(p7out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1608-
}
1609-
if (sigBase64 != NULL) {
1610-
XFREE(sigBase64, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1611-
}
1602+
XFREE(p7out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1603+
XFREE(sigBase64, NULL, DYNAMIC_TYPE_TMP_BUFFER);
16121604

16131605
if (ret > 0) {
16141606
return WOLFSSL_SUCCESS;
@@ -1736,9 +1728,7 @@ int wolfSSL_i2d_PKCS12_bio(WOLFSSL_BIO *bio, WC_PKCS12 *pkcs12)
17361728
}
17371729
}
17381730

1739-
if (certDer != NULL) {
1740-
XFREE(certDer, NULL, DYNAMIC_TYPE_PKCS);
1741-
}
1731+
XFREE(certDer, NULL, DYNAMIC_TYPE_PKCS);
17421732
}
17431733

17441734
return ret;
@@ -1900,12 +1890,8 @@ int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw,
19001890
*ca = (WOLF_STACK_OF(WOLFSSL_X509)*)XMALLOC(
19011891
sizeof(WOLF_STACK_OF(WOLFSSL_X509)), heap, DYNAMIC_TYPE_X509);
19021892
if (*ca == NULL) {
1903-
if (pk != NULL) {
1904-
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
1905-
}
1906-
if (certData != NULL) {
1907-
XFREE(certData, heap, DYNAMIC_TYPE_PKCS);
1908-
}
1893+
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
1894+
XFREE(certData, heap, DYNAMIC_TYPE_PKCS);
19091895
/* Free up WC_DerCertList and move on */
19101896
while (current != NULL) {
19111897
WC_DerCertList* next = current->next;
@@ -1939,12 +1925,8 @@ int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw,
19391925
FreeDecodedCert(DeCert);
19401926
wolfSSL_X509_free(x509);
19411927
wolfSSL_sk_X509_pop_free(*ca, NULL); *ca = NULL;
1942-
if (pk != NULL) {
1943-
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
1944-
}
1945-
if (certData != NULL) {
1946-
XFREE(certData, heap, DYNAMIC_TYPE_PKCS);
1947-
}
1928+
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
1929+
XFREE(certData, heap, DYNAMIC_TYPE_PKCS);
19481930
/* Free up WC_DerCertList */
19491931
while (current != NULL) {
19501932
WC_DerCertList* next = current->next;
@@ -1962,12 +1944,8 @@ int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw,
19621944
WOLFSSL_MSG("Failed to push x509 onto stack");
19631945
wolfSSL_X509_free(x509);
19641946
wolfSSL_sk_X509_pop_free(*ca, NULL); *ca = NULL;
1965-
if (pk != NULL) {
1966-
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
1967-
}
1968-
if (certData != NULL) {
1969-
XFREE(certData, heap, DYNAMIC_TYPE_PKCS);
1970-
}
1947+
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
1948+
XFREE(certData, heap, DYNAMIC_TYPE_PKCS);
19711949

19721950
/* Free up WC_DerCertList */
19731951
while (current != NULL) {
@@ -1993,9 +1971,7 @@ int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw,
19931971
*cert = (WOLFSSL_X509*)XMALLOC(sizeof(WOLFSSL_X509), heap,
19941972
DYNAMIC_TYPE_X509);
19951973
if (*cert == NULL) {
1996-
if (pk != NULL) {
1997-
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
1998-
}
1974+
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
19991975
if (ca != NULL) {
20001976
wolfSSL_sk_X509_pop_free(*ca, NULL); *ca = NULL;
20011977
}
@@ -2011,9 +1987,7 @@ int wolfSSL_PKCS12_parse(WC_PKCS12* pkcs12, const char* psw,
20111987
if (CopyDecodedToX509(*cert, DeCert) != 0) {
20121988
WOLFSSL_MSG("Failed to copy decoded cert");
20131989
FreeDecodedCert(DeCert);
2014-
if (pk != NULL) {
2015-
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
2016-
}
1990+
XFREE(pk, heap, DYNAMIC_TYPE_PUBLIC_KEY);
20171991
if (ca != NULL) {
20181992
wolfSSL_sk_X509_pop_free(*ca, NULL); *ca = NULL;
20191993
}

‎src/tls.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5974,9 +5974,7 @@ static TlsxSrtp* TLSX_UseSRTP_New(word16 ids, void* heap)
59745974

59755975
static void TLSX_UseSRTP_Free(TlsxSrtp *srtp, void* heap)
59765976
{
5977-
if (srtp != NULL) {
5978-
XFREE(srtp, heap, DYNAMIC_TYPE_TLSX);
5979-
}
5977+
XFREE(srtp, heap, DYNAMIC_TYPE_TLSX);
59805978
(void)heap;
59815979
}
59825980

0 commit comments

Comments
 (0)