Skip to content

Commit 05033c9

Browse files
committed
Fix bug #72140 (segfault after calling ERR_free_strings())
1 parent 6d3fa65 commit 05033c9

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ PHP NEWS
99
. Fixed bug #70484 (selectordinal doesn't work with named parameters).
1010
(Anatol)
1111

12+
- OpenSSL:
13+
. Fixed bug #72140 (segfault after calling ERR_free_strings()).
14+
(Jakub Zelenka)
15+
1216
26 May 2016, PHP 5.6.22
1317

1418
- Core:

ext/openssl/openssl.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,9 @@ PHP_MSHUTDOWN_FUNCTION(openssl)
12781278
EVP_cleanup();
12791279

12801280
#if OPENSSL_VERSION_NUMBER >= 0x00090805f
1281+
/* prevent accessing locking callback from unloaded extension */
1282+
CRYPTO_set_locking_callback(NULL);
1283+
/* free allocated error strings */
12811284
ERR_free_strings();
12821285
#endif
12831286

0 commit comments

Comments
 (0)