diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-08 18:21:39 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-08 18:21:39 +0100 |
| commit | 05033c9ebd015baf825581e5725a594da277d560 (patch) | |
| tree | 9939432e19329bd9673cff17611807b7e491f0ae | |
| parent | 6d3fa654b702c8762aa80ab795080f5c4464d677 (diff) | |
| download | php-git-05033c9ebd015baf825581e5725a594da277d560.tar.gz | |
Fix bug #72140 (segfault after calling ERR_free_strings())
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/openssl/openssl.c | 3 |
2 files changed, 7 insertions, 0 deletions
@@ -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 88e396c630..79f666acc5 100644 --- 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 |