Share static_variables table for fake closures

dstogov · dstogov · commit 2306ca7c9b36 · 2021-08-24T14:02:34.000+03:00
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -689,6 +689,14 @@ static void zend_create_closure_ex(zval *res, zend_function *func, zend_class_en
 			}
 			ZEND_MAP_PTR_INIT(closure->func.op_array.static_variables_ptr,
 				closure->func.op_array.static_variables);
+		} else if (func->op_array.static_variables) {
+			HashTable *ht = ZEND_MAP_PTR_GET(func->op_array.static_variables_ptr);
+
+			if (!ht) {
+				ht = zend_array_dup(func->op_array.static_variables);
+				ZEND_MAP_PTR_SET(func->op_array.static_variables_ptr, ht);
+			}
+			ZEND_MAP_PTR_INIT(closure->func.op_array.static_variables_ptr, ht);
 		}
 
 		/* Runtime cache is scope-dependent, so we cannot reuse it if the scope changed */

Original file line number	Diff line number	Diff line change
`@@ -689,6 +689,14 @@ static void zend_create_closure_ex(zval res, zend_function func, zend_class_en`
`689`	`689`	`}`
`690`	`690`	`ZEND_MAP_PTR_INIT(closure->func.op_array.static_variables_ptr,`
`691`	`691`	`closure->func.op_array.static_variables);`
	`692`	`+ } else if (func->op_array.static_variables) {`
	`693`	`+ HashTable *ht = ZEND_MAP_PTR_GET(func->op_array.static_variables_ptr);`
	`694`	`+`
	`695`	`+ if (!ht) {`
	`696`	`+ ht = zend_array_dup(func->op_array.static_variables);`
	`697`	`+ ZEND_MAP_PTR_SET(func->op_array.static_variables_ptr, ht);`
	`698`	`+ }`
	`699`	`+ ZEND_MAP_PTR_INIT(closure->func.op_array.static_variables_ptr, ht);`
`692`	`700`	`}`
`693`	`701`
`694`	`702`	`/* Runtime cache is scope-dependent, so we cannot reuse it if the scope changed */`