Merge branch 'PHP-7.4'

nikic · nikic · commit ad661375e86b · 2019-08-28T17:36:31.000+02:00
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -305,7 +305,7 @@ void shutdown_executor(void) /* {{{ */
 						if (op_array->static_variables) {
 							HashTable *ht = ZEND_MAP_PTR_GET(op_array->static_variables_ptr);
 							if (ht) {
-								if (GC_DELREF(ht) == 0) {
+								if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE) && GC_DELREF(ht) == 0) {
 									zend_array_destroy(ht);
 								}
 								ZEND_MAP_PTR_SET(op_array->static_variables_ptr, NULL);

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ void shutdown_executor(void) /* {{{ */`
`305`	`305`	`if (op_array->static_variables) {`
`306`	`306`	`HashTable *ht = ZEND_MAP_PTR_GET(op_array->static_variables_ptr);`
`307`	`307`	`if (ht) {`
`308`		`- if (GC_DELREF(ht) == 0) {`
	`308`	`+ if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE) && GC_DELREF(ht) == 0) {`
`309`	`309`	`zend_array_destroy(ht);`
`310`	`310`	`}`
`311`	`311`	`ZEND_MAP_PTR_SET(op_array->static_variables_ptr, NULL);`