more: no need for null check before free

ok tedu guenther

2 files changed, 7 insertions, 14 deletions

diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index e31940da45..a71959222f 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -294,8 +294,7 @@ OBJ_add_object(const ASN1_OBJECT *obj)
                         ao[i]->obj = o;
                         aop = lh_ADDED_OBJ_insert(added, ao[i]);
                         /* memory leak, buit should not normally matter */
-                        if (aop != NULL)
-                                free(aop);
+                        free(aop);
                 }
         }
         o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC |
@@ -308,10 +307,8 @@ err2:
         OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE);
 err:
         for (i = ADDED_DATA; i <= ADDED_NID; i++)
-                if (ao[i] != NULL)
-                        free(ao[i]);
-        if (o != NULL)
-                free(o);
+                free(ao[i]);
+        free(o);
         return (NID_undef);
 }
 
diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c
index 57f0b28cc0..25bc8fb5ee 100644
--- a/src/lib/libcrypto/objects/obj_lib.c
+++ b/src/lib/libcrypto/objects/obj_lib.c
@@ -114,14 +114,10 @@ OBJ_dup(const ASN1_OBJECT *o)
 
 err:
         OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE);
-        if (ln != NULL)
-                free(ln);
-        if (sn != NULL)
-                free(sn);
-        if (data != NULL)
-                free(data);
-        if (r != NULL)
-                free(r);
+        free(ln);
+        free(sn);
+        free(data);
+        free(r);
         return (NULL);
 }