Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed use-after-free
This commit is contained in:
Dmitry Stogov 2019-06-28 10:44:13 +03:00
commit 696b9e25c8

View file

@ -357,6 +357,7 @@ void shutdown_executor(void) /* {{{ */
if (ht) {
ZEND_ASSERT(GC_REFCOUNT(ht) == 1);
zend_array_destroy(ht);
ZEND_MAP_PTR_SET(op_array->static_variables_ptr, NULL);
}
}
} ZEND_HASH_FOREACH_END();
@ -388,6 +389,7 @@ void shutdown_executor(void) /* {{{ */
if (ht) {
ZEND_ASSERT(GC_REFCOUNT(ht) == 1);
zend_array_destroy(ht);
ZEND_MAP_PTR_SET(op_array->static_variables_ptr, NULL);
}
}
}