Fix bug #72140 (segfault after calling ERR_free_strings())

diff --git a/NEWS b/NEWS
index 8686b862f851257d27dca9f67a92213c649120b5..221d5eb369083f81953315bde1c6ca67ea330e06 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ PHP                                                                        NEWS
   . Fixed bug #70484 (selectordinal doesn't work with named parameters).
     (Anatol)
 
+- OpenSSL:
+  . Fixed bug #72140 (segfault after calling ERR_free_strings()).
+    (Jakub Zelenka)
+
 26 May 2016, PHP 5.6.22
 
 - Core:

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 88e396c630976329e9931d1e37de1c2bb832ddd8..79f666acc5a6421eff70764446f5038e8c660907 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1278,6 +1278,9 @@ PHP_MSHUTDOWN_FUNCTION(openssl)
        EVP_cleanup();
 
 #if OPENSSL_VERSION_NUMBER >= 0x00090805f
+       /* prevent accessing locking callback from unloaded extension */
+       CRYPTO_set_locking_callback(NULL);
+       /* free allocated error strings */
        ERR_free_strings();
 #endif