From 9e4ad1e2af22f00eeca533b745b67956f57319cb Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 18 Jan 2018 12:10:58 +0100
Subject: openssl: fix potential memory leak in SSLKEYLOGFILE logic

Coverity CID 1427646.
---
 lib/vtls/openssl.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'lib/vtls')

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 135e3ac54..93faa6fa8 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -944,20 +944,23 @@ static int Curl_ossl_init(void)
 #endif
 
 #ifdef ENABLE_SSLKEYLOGFILE
-  keylog_file_name = curl_getenv("SSLKEYLOGFILE");
-  if(keylog_file_name && !keylog_file_fp) {
-    keylog_file_fp = fopen(keylog_file_name, FOPEN_APPENDTEXT);
-    if(keylog_file_fp) {
+  if(!keylog_file_fp) {
+    keylog_file_name = curl_getenv("SSLKEYLOGFILE");
+    if(keylog_file_name) {
+      keylog_file_fp = fopen(keylog_file_name, FOPEN_APPENDTEXT);
+      if(keylog_file_fp) {
 #ifdef WIN32
-      if(setvbuf(keylog_file_fp, NULL, _IONBF, 0)) {
+        if(setvbuf(keylog_file_fp, NULL, _IONBF, 0))
 #else
-      if(setvbuf(keylog_file_fp, NULL, _IOLBF, 4096)) {
+        if(setvbuf(keylog_file_fp, NULL, _IOLBF, 4096))
 #endif
-        fclose(keylog_file_fp);
-        keylog_file_fp = NULL;
+        {
+          fclose(keylog_file_fp);
+          keylog_file_fp = NULL;
+        }
       }
+      Curl_safefree(keylog_file_name);
     }
-    Curl_safefree(keylog_file_name);
   }
 #endif
 
-- 
cgit v1.2.3