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/pem/pem_info.c | 18 ++++++------------
 src/lib/libcrypto/pem/pem_seal.c |  6 ++----
 src/lib/libcrypto/pem/pem_sign.c |  3 +--
 3 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'src/lib/libcrypto/pem')

diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c
index 40600e30f3..7605c7653c 100644
--- a/src/lib/libcrypto/pem/pem_info.c
+++ b/src/lib/libcrypto/pem/pem_info.c
@@ -256,12 +256,9 @@ start:
 		} else {
 			/* unknown */
 		}
-		if (name != NULL)
-			free(name);
-		if (header != NULL)
-			free(header);
-		if (data != NULL)
-			free(data);
+		free(name);
+		free(header);
+		free(data);
 		name = NULL;
 		header = NULL;
 		data = NULL;
@@ -291,12 +288,9 @@ err:
 		ret = NULL;
 	}
 
-	if (name != NULL)
-		free(name);
-	if (header != NULL)
-		free(header);
-	if (data != NULL)
-		free(data);
+	free(name);
+	free(header);
+	free(data);
 	return (ret);
 }
 
diff --git a/src/lib/libcrypto/pem/pem_seal.c b/src/lib/libcrypto/pem/pem_seal.c
index a7b9379223..e6e73dd23d 100644
--- a/src/lib/libcrypto/pem/pem_seal.c
+++ b/src/lib/libcrypto/pem/pem_seal.c
@@ -113,8 +113,7 @@ PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
 	ret = npubk;
 
 err:
-	if (s != NULL)
-		free(s);
+	free(s);
 	OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
 	return (ret);
 }
@@ -182,8 +181,7 @@ PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
 err:
 	EVP_MD_CTX_cleanup(&ctx->md);
 	EVP_CIPHER_CTX_cleanup(&ctx->cipher);
-	if (s != NULL)
-		free(s);
+	free(s);
 	return (ret);
 }
 #endif
diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c
index 8a6bcc8d8d..bfe7823e3d 100644
--- a/src/lib/libcrypto/pem/pem_sign.c
+++ b/src/lib/libcrypto/pem/pem_sign.c
@@ -100,7 +100,6 @@ PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
 
 err:
 	/* ctx has been zeroed by EVP_SignFinal() */
-	if (m != NULL)
-		free(m);
+	free(m);
 	return (ret);
 }
-- 
cgit v1.2.3-55-g6feb