more: no need for null check before free

ok tedu guenther

2 files changed, 7 insertions, 14 deletions

diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c
index 98e058dad4..41c5b05fcb 100644
--- a/src/lib/libcrypto/conf/conf_api.c
+++ b/src/lib/libcrypto/conf/conf_api.c
@@ -300,8 +300,7 @@ err:
         if (!ok) {
                 if (sk != NULL)
                         sk_CONF_VALUE_free(sk);
-                if (v != NULL)
-                        free(v);
+                free(v);
                 v = NULL;
         }
         return (v);
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index b3c75e1a9e..b550623e57 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -416,15 +416,13 @@ again:
         }
         if (buff != NULL)
                 BUF_MEM_free(buff);
-        if (section != NULL)
-                free(section);
+        free(section);
         return (1);
 
 err:
         if (buff != NULL)
                 BUF_MEM_free(buff);
-        if (section != NULL)
-                free(section);
+        free(section);
         if (line != NULL)
                 *line = eline;
         ERR_asprintf_error_data("line %ld", eline);
@@ -433,12 +431,9 @@ err:
                 conf->data = NULL;
         }
         if (v != NULL) {
-                if (v->name != NULL)
-                        free(v->name);
-                if (v->value != NULL)
-                        free(v->value);
-                if (v != NULL)
-                        free(v);
+                free(v->name);
+                free(v->value);
+                free(v);
         }
         return (0);
 }
@@ -615,8 +610,7 @@ str_copy(CONF *conf, char *section, char **pto, char *from)
                         buf->data[to++] = *(from++);
         }
         buf->data[to]='\0';
-        if (*pto != NULL)
-                free(*pto);
+        free(*pto);
         *pto = buf->data;
         free(buf);
         return (1);