Fixed bug #68676 (Explicit Double Free)

diff --git a/NEWS b/NEWS
index af00bf633d9069665dddd5c0c9b1943c752653f2..0ad3fa07499a6f3ce78aeafc24e641cc60aff578 100644 (file)
--- 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 100bcf188d6e67af3a0f96d553632f453a0efc9c..024f81752ab704b4f4d56ade7becff5cf9617e55 100644 (file)
--- 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
 }