summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2014-12-29 10:57:42 +0100
committerKalle Sommer Nielsen <kalle@php.net>2014-12-29 10:57:42 +0100
commit24125f0f26f3787c006e4a51611ba33ee3b841cb (patch)
treecc8441eef82246e1096bfdf61ad0e8e113ff8441
parent422f323982730f5a42debb2c71285d0958d196d2 (diff)
downloadphp-git-24125f0f26f3787c006e4a51611ba33ee3b841cb.tar.gz
Fixed bug #68676 (Explicit Double Free)
-rw-r--r--NEWS3
-rw-r--r--Zend/zend_ts_hash.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index af00bf633d..0ad3fa0749 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-PHP NEWS
+PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2015, PHP 5.6.5
@@ -15,6 +15,7 @@ PHP NEWS
. Fixed bug #68583 (Crash in timeout thread). (Anatol)
. Fixed bug #65576 (Constructor from trait conflicts with inherited
constructor). (dunglas at gmail dot com)
+ . Fixed bug #68676 (Explicit Double Free). (Kalle)
- cURL:
. Fixed bug #67643 (curl_multi_getcontent returns '' when
diff --git a/Zend/zend_ts_hash.c b/Zend/zend_ts_hash.c
index 100bcf188d..024f81752a 100644
--- a/Zend/zend_ts_hash.c
+++ b/Zend/zend_ts_hash.c
@@ -151,7 +151,7 @@ ZEND_API void zend_ts_hash_graceful_destroy(TsHashTable *ht)
#ifdef ZTS
tsrm_mutex_free(ht->mx_reader);
- tsrm_mutex_free(ht->mx_reader);
+ tsrm_mutex_free(ht->mx_writer);
#endif
}