summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2014-12-29 11:04:23 +0100
committerKalle Sommer Nielsen <kalle@php.net>2014-12-29 11:04:23 +0100
commitfbf3a6bc1abcc8a5b5226b0ad9464c37f11ddbd6 (patch)
tree1423e308fa63ec68b8da2ff93031159eb2f1ff9e
parentaa192f57c9d867ab3d7be69c7f269cfd7a10d14f (diff)
downloadphp-git-fbf3a6bc1abcc8a5b5226b0ad9464c37f11ddbd6.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 8d6fdff92b..8bcb236ef9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-PHP NEWS
+PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2014, PHP 5.5.21
@@ -16,6 +16,7 @@ PHP NEWS
. Fixed bug #68583 (Crash in timeout thread). (Anatol)
. Fixed bug #68594 (Use after free vulnerability in unserialize()).
(CVE-2014-8142) (Stefan Esser)
+ . 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 6f2eb8185c..bf6ed4f2f1 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
}