From abd9b10898e82011a65d8e8fca56bf56532edd69 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 30 May 2014 06:22:57 +0000
Subject: more: no need for null check before free ok tedu guenther

---
 src/lib/libcrypto/objects/obj_dat.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/lib/libcrypto/objects/obj_dat.c')

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);
 }
 
-- 
cgit v1.2.3-55-g6feb