From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 17 Feb 2017 17:32:26 +0000 (+0000)
Subject: Revert it part r1783317, 'avoid _free()ing NULL references.'
X-Git-Tag: 2.5.0-alpha~650
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08e986a8aa250a2e2ba42813e58c69deb8e30f51;p=apache

Revert it part r1783317, 'avoid _free()ing NULL references.'

OpenSSL team is committed to preserving safe _free(NULL) behaviors, and the
overhead of these calls in the context setup path is inconsequential.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783434 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index b4e74c3102..d6248c5b06 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -1334,10 +1334,8 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
 #endif
     }
 #endif
-    if (eckey)
-        EC_KEY_free(eckey);
-    if (ecparams)
-        EC_GROUP_free(ecparams);
+    EC_KEY_free(eckey);
+    EC_GROUP_free(ecparams);
 #endif
 
     return APR_SUCCESS;