BUF_MEM_free(), X509_STORE_free() and X509_VERIFY_PARAM_free() all check

for NULL, as does lh_free() - do not do the same from the caller.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index ecd0f9e886..0600e7519e 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.173 2017/01/24 15:04:12 jsing Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.174 2017/01/24 15:11:55 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -520,10 +520,8 @@ ssl3_connect(SSL *s)
                         /* clean a few things up */
                         tls1_cleanup_key_block(s);
 
-                        if (s->internal->init_buf != NULL) {
-                                BUF_MEM_free(s->internal->init_buf);
-                                s->internal->init_buf = NULL;
-                        }
+                        BUF_MEM_free(s->internal->init_buf);
+                        s->internal->init_buf = NULL;
 
                         /*
                          * If we are not 'joining' the last two packets,