no need for null check before free. from Brendan MacDonell

9 files changed, 14 insertions, 28 deletions

diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c
index 8652e938bd..771b4f9690 100644
--- a/src/lib/libcrypto/asn1/ameth_lib.c
+++ b/src/lib/libcrypto/asn1/ameth_lib.c
@@ -380,10 +380,8 @@ void
 EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
 {
         if (ameth && (ameth->pkey_flags & ASN1_PKEY_DYNAMIC)) {
-                if (ameth->pem_str)
-                        free(ameth->pem_str);
-                if (ameth->info)
-                        free(ameth->info);
+                free(ameth->pem_str);
+                free(ameth->info);
                 free(ameth);
         }
 }
diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index c2f0837a1c..b28cdc56cf 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/asn1/asn1_lib.c
@@ -401,8 +401,7 @@ ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
 void
 ASN1_STRING_set0(ASN1_STRING *str, void *data, int len)
 {
-        if (str->data)
-                free(str->data);
+        free(str->data);
         str->data = data;
         str->length = len;
 }
diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c
index 5d70b76f05..f123a7ddc0 100644
--- a/src/lib/libcrypto/asn1/asn_mime.c
+++ b/src/lib/libcrypto/asn1/asn_mime.c
@@ -949,10 +949,8 @@ mime_param_find(MIME_HEADER *hdr, char *name)
 static void
 mime_hdr_free(MIME_HEADER *hdr)
 {
-        if (hdr->name)
-                free(hdr->name);
-        if (hdr->value)
-                free(hdr->value);
+        free(hdr->name);
+        free(hdr->value);
         if (hdr->params)
                 sk_MIME_PARAM_pop_free(hdr->params, mime_param_free);
         free(hdr);
@@ -961,10 +959,8 @@ mime_hdr_free(MIME_HEADER *hdr)
 static void
 mime_param_free(MIME_PARAM *param)
 {
-        if (param->param_name)
-                free(param->param_name);
-        if (param->param_value)
-                free(param->param_value);
+        free(param->param_name);
+        free(param->param_value);
         free(param);
 }
 
diff --git a/src/lib/libcrypto/asn1/bio_asn1.c b/src/lib/libcrypto/asn1/bio_asn1.c
index 327355eeda..223461d933 100644
--- a/src/lib/libcrypto/asn1/bio_asn1.c
+++ b/src/lib/libcrypto/asn1/bio_asn1.c
@@ -186,8 +186,7 @@ asn1_bio_free(BIO *b)
         ctx = (BIO_ASN1_BUF_CTX *) b->ptr;
         if (ctx == NULL)
                 return 0;
-        if (ctx->buf)
-                free(ctx->buf);
+        free(ctx->buf);
         free(ctx);
         b->init = 0;
         b->ptr = NULL;
diff --git a/src/lib/libcrypto/asn1/bio_ndef.c b/src/lib/libcrypto/asn1/bio_ndef.c
index 66be025127..f7fa2e69bc 100644
--- a/src/lib/libcrypto/asn1/bio_ndef.c
+++ b/src/lib/libcrypto/asn1/bio_ndef.c
@@ -186,8 +186,7 @@ ndef_prefix_free(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
         ndef_aux = *(NDEF_SUPPORT **)parg;
 
-        if (ndef_aux->derbuf)
-                free(ndef_aux->derbuf);
+        free(ndef_aux->derbuf);
 
         ndef_aux->derbuf = NULL;
         *pbuf = NULL;
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index c8b379f371..b524104d91 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -951,8 +951,7 @@ asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len, int utype,
                 }
                 /* If we've already allocated a buffer use it */
                 if (*free_cont) {
-                        if (stmp->data)
-                                free(stmp->data);
+                        free(stmp->data);
                         stmp->data = (unsigned char *)cont; /* UGLY CAST! RL */
                         stmp->length = len;
                         *free_cont = 0;
diff --git a/src/lib/libcrypto/asn1/tasn_utl.c b/src/lib/libcrypto/asn1/tasn_utl.c
index e1051c2c3e..446a6f82bd 100644
--- a/src/lib/libcrypto/asn1/tasn_utl.c
+++ b/src/lib/libcrypto/asn1/tasn_utl.c
@@ -153,8 +153,7 @@ asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 
         enc = asn1_get_enc_ptr(pval, it);
         if (enc) {
-                if (enc->enc)
-                        free(enc->enc);
+                free(enc->enc);
                 enc->enc = NULL;
                 enc->len = 0;
                 enc->modified = 1;
@@ -171,8 +170,7 @@ asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
         if (!enc)
                 return 1;
 
-        if (enc->enc)
-                free(enc->enc);
+        free(enc->enc);
         enc->enc = malloc(inlen);
         if (!enc->enc)
                 return 0;
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
index 70459babc4..366ff17976 100644
--- a/src/lib/libcrypto/asn1/x_name.c
+++ b/src/lib/libcrypto/asn1/x_name.c
@@ -164,8 +164,7 @@ x509_name_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 
         BUF_MEM_free(a->bytes);
         sk_X509_NAME_ENTRY_pop_free(a->entries, X509_NAME_ENTRY_free);
-        if (a->canon_enc)
-                free(a->canon_enc);
+        free(a->canon_enc);
         free(a);
         *pval = NULL;
 }
diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c
index df915e2dfd..f8b22fc372 100644
--- a/src/lib/libcrypto/asn1/x_pubkey.c
+++ b/src/lib/libcrypto/asn1/x_pubkey.c
@@ -355,8 +355,7 @@ X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj, int ptype,
         if (!X509_ALGOR_set0(pub->algor, aobj, ptype, pval))
                 return 0;
         if (penc) {
-                if (pub->public_key->data)
-                        free(pub->public_key->data);
+                free(pub->public_key->data);
                 pub->public_key->data = penc;
                 pub->public_key->length = penclen;
                 /* Set number of unused bits to zero */