From b7736ef4d5ff83b914e6f7ae448780bf8ea18ff6 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 6 May 2017 21:25:15 +0000
Subject: BIO_free_all() and EVP_PKEY_free() can be called with NULL.

---
 src/lib/libtls/tls_util.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libtls/tls_util.c b/src/lib/libtls/tls_util.c
index c643b4a9f6..39504940cf 100644
--- a/src/lib/libtls/tls_util.c
+++ b/src/lib/libtls/tls_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_util.c,v 1.6 2017/05/06 20:57:45 jsing Exp $ */
+/* $OpenBSD: tls_util.c,v 1.7 2017/05/06 21:25:15 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -171,10 +171,8 @@ tls_load_file(const char *name, size_t *len, char *password)
 	free(buf);
 	if (fd != -1)
 		close(fd);
-	if (bio != NULL)
-		BIO_free_all(bio);
-	if (key != NULL)
-		EVP_PKEY_free(key);
+	BIO_free_all(bio);
+	EVP_PKEY_free(key);
 
 	return (NULL);
 }
-- 
cgit v1.2.3-55-g6feb