Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75742 (potential memleak in internal classes's static members)
This commit is contained in:
Xinchen Hui 2017-12-28 16:31:40 +08:00
commit 7dffc6e301

View File

@ -296,6 +296,8 @@ void shutdown_executor(void) /* {{{ */
break;
}
} ZEND_HASH_FOREACH_END_DEL();
zend_cleanup_internal_classes();
} else {
zend_hash_graceful_reverse_destroy(&EG(symbol_table));
@ -358,6 +360,8 @@ void shutdown_executor(void) /* {{{ */
} ZEND_HASH_FOREACH_END_DEL();
}
zend_cleanup_internal_classes();
while (EG(symtable_cache_ptr)>=EG(symtable_cache)) {
zend_hash_destroy(*EG(symtable_cache_ptr));
FREE_HASHTABLE(*EG(symtable_cache_ptr));
@ -388,8 +392,6 @@ void shutdown_executor(void) /* {{{ */
EG(ht_iterators_used) = 0;
zend_cleanup_internal_classes();
zend_shutdown_fpu();
}
/* }}} */