From 8ce73486251fad4cfbf25ab7503bdafb1b5c1d6d Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Thu, 9 Jan 2003 13:05:57 +0000
Subject: [PATCH] NULL tofree when it is freed to avoid double free.

Make sure key is not NULL before freeing it.
---
 apps/ca.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/ca.c b/apps/ca.c
index 93e61f610b..5b490c80ec 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -76,6 +76,8 @@
 #include <openssl/ocsp.h>
 #include <openssl/pem.h>
 
+#include <dmalloc.h>
+
 #ifdef OPENSSL_SYS_WINDOWS
 #define strcasecmp _stricmp
 #else
@@ -597,7 +599,10 @@ bad:
 		goto err;
 		}
 	if(tofree)
+		{
 		OPENSSL_free(tofree);
+		tofree = NULL;
+		}
 
 	if (!load_config(bio_err, conf))
 		goto err;
@@ -1637,7 +1642,7 @@ err:
 
 	if (ret) ERR_print_errors(bio_err);
 	app_RAND_write_file(randfile, bio_err);
-	if (free_key)
+	if (free_key && key)
 		OPENSSL_free(key);
 	BN_free(serial);
 	TXT_DB_free(db);
-- 
2.25.1