From a2f907def2edfc825d9e3cec19c6bc1c6c035661 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Fri, 25 Jul 2014 06:05:32 +0000
Subject: BIO_free() returns immediately when the sole input is NULL. Remove
 unnecessary NULL check.

ok miod@
---
 src/lib/libcrypto/bio/bio_lib.c  | 5 ++---
 src/lib/libcrypto/bio/bss_acpt.c | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

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

diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index a2b34a2f80..477208ed1f 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_lib.c,v 1.20 2014/07/11 15:40:32 miod Exp $ */
+/* $OpenBSD: bio_lib.c,v 1.21 2014/07/25 06:05:32 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -575,8 +575,7 @@ BIO_dup_chain(BIO *in)
 	}
 	return (ret);
 err:
-	if (ret != NULL)
-		BIO_free(ret);
+	BIO_free(ret);
 	return (NULL);
 
 }
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 65d4bb2547..b6131c4d41 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_acpt.c,v 1.24 2014/07/13 16:03:09 beck Exp $ */
+/* $OpenBSD: bss_acpt.c,v 1.25 2014/07/25 06:05:32 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -153,8 +153,7 @@ BIO_ACCEPT_free(BIO_ACCEPT *a)
 
 	free(a->param_addr);
 	free(a->addr);
-	if (a->bio_chain != NULL)
-		BIO_free(a->bio_chain);
+	BIO_free(a->bio_chain);
 	free(a);
 }
 
@@ -358,8 +357,7 @@ acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
 			} else if (num == 1) {
 				data->accept_nbio = (ptr != NULL);
 			} else if (num == 2) {
-				if (data->bio_chain != NULL)
-					BIO_free(data->bio_chain);
+				BIO_free(data->bio_chain);
 				data->bio_chain = (BIO *)ptr;
 			}
 		}
-- 
cgit v1.2.3-55-g6feb