]> granicus.if.org Git - apache/commitdiff
Revert it part r1783317, 'avoid _free()ing NULL references.'
authorWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 17 Feb 2017 17:32:26 +0000 (17:32 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 17 Feb 2017 17:32:26 +0000 (17:32 +0000)
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

modules/ssl/ssl_engine_init.c

index b4e74c3102771aef31c3b37ee4c0fa9007bf2a6d..d6248c5b06018103c7c77bdbd5f9e7b76c5b8e3a 100644 (file)
@@ -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;