From fa03bdcd17251bec54215a778d2e211e7517a8d7 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 30 May 2014 06:24:17 +0000
Subject: more: no need to null check before free; ok guenther

---
 src/lib/libcrypto/dh/dh_ameth.c           | 2 +-
 src/lib/libcrypto/dsa/dsa_ameth.c         | 2 +-
 src/lib/libcrypto/rsa/rsa_ameth.c         | 2 +-
 src/lib/libcrypto/rsa/rsa_oaep.c          | 2 +-
 src/lib/libssl/src/crypto/dh/dh_ameth.c   | 2 +-
 src/lib/libssl/src/crypto/dsa/dsa_ameth.c | 2 +-
 src/lib/libssl/src/crypto/rsa/rsa_ameth.c | 2 +-
 src/lib/libssl/src/crypto/rsa/rsa_oaep.c  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c
index 119ac615a6..fe3dfc40d1 100644
--- a/src/lib/libcrypto/dh/dh_ameth.c
+++ b/src/lib/libcrypto/dh/dh_ameth.c
@@ -382,7 +382,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
 err:
 		DHerr(DH_F_DO_DH_PRINT,reason);
 		}
-	if (m != NULL) free(m);
+	free(m);
 	return(ret);
 	}
 
diff --git a/src/lib/libcrypto/dsa/dsa_ameth.c b/src/lib/libcrypto/dsa/dsa_ameth.c
index e2c3980e56..c6d04f6a5d 100644
--- a/src/lib/libcrypto/dsa/dsa_ameth.c
+++ b/src/lib/libcrypto/dsa/dsa_ameth.c
@@ -481,7 +481,7 @@ static int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)
 	if (!ASN1_bn_print(bp,"G:   ",x->g,m,off)) goto err;
 	ret=1;
 err:
-	if (m != NULL) free(m);
+	free(m);
 	return(ret);
 	}
 
diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c
index f0a346a70e..2c7e39bb1d 100644
--- a/src/lib/libcrypto/rsa/rsa_ameth.c
+++ b/src/lib/libcrypto/rsa/rsa_ameth.c
@@ -248,7 +248,7 @@ static int do_rsa_print(BIO *bp, const RSA *x, int off, int priv)
 		}
 	ret=1;
 err:
-	if (m != NULL) free(m);
+	free(m);
 	return(ret);
 	}
 
diff --git a/src/lib/libcrypto/rsa/rsa_oaep.c b/src/lib/libcrypto/rsa/rsa_oaep.c
index a107e89b81..53d35621a3 100644
--- a/src/lib/libcrypto/rsa/rsa_oaep.c
+++ b/src/lib/libcrypto/rsa/rsa_oaep.c
@@ -179,7 +179,7 @@ decoding_err:
 	/* to avoid chosen ciphertext attacks, the error message should not reveal
 	 * which kind of decoding error happened */
 	RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_OAEP_DECODING_ERROR);
-	if (db != NULL) free(db);
+	free(db);
 	return -1;
 	}
 
diff --git a/src/lib/libssl/src/crypto/dh/dh_ameth.c b/src/lib/libssl/src/crypto/dh/dh_ameth.c
index 119ac615a6..fe3dfc40d1 100644
--- a/src/lib/libssl/src/crypto/dh/dh_ameth.c
+++ b/src/lib/libssl/src/crypto/dh/dh_ameth.c
@@ -382,7 +382,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
 err:
 		DHerr(DH_F_DO_DH_PRINT,reason);
 		}
-	if (m != NULL) free(m);
+	free(m);
 	return(ret);
 	}
 
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_ameth.c b/src/lib/libssl/src/crypto/dsa/dsa_ameth.c
index e2c3980e56..c6d04f6a5d 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_ameth.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_ameth.c
@@ -481,7 +481,7 @@ static int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)
 	if (!ASN1_bn_print(bp,"G:   ",x->g,m,off)) goto err;
 	ret=1;
 err:
-	if (m != NULL) free(m);
+	free(m);
 	return(ret);
 	}
 
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_ameth.c b/src/lib/libssl/src/crypto/rsa/rsa_ameth.c
index f0a346a70e..2c7e39bb1d 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_ameth.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_ameth.c
@@ -248,7 +248,7 @@ static int do_rsa_print(BIO *bp, const RSA *x, int off, int priv)
 		}
 	ret=1;
 err:
-	if (m != NULL) free(m);
+	free(m);
 	return(ret);
 	}
 
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_oaep.c b/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
index a107e89b81..53d35621a3 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
@@ -179,7 +179,7 @@ decoding_err:
 	/* to avoid chosen ciphertext attacks, the error message should not reveal
 	 * which kind of decoding error happened */
 	RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_OAEP_DECODING_ERROR);
-	if (db != NULL) free(db);
+	free(db);
 	return -1;
 	}
 
-- 
cgit v1.2.3-55-g6feb