Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Fixed uninitialized EX(opline) access (possible Zend/tests/gh12073.phpt crash)
dstogov · Sep 5, 2023 · ab6d564 · ab6d564
2 parents 6850a04 + f1f608b
commit ab6d564
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -8064,6 +8064,7 @@ ZEND_VM_HANDLER(142, ZEND_DECLARE_LAMBDA_FUNCTION, CONST, NUM)
 		called_scope = Z_CE(EX(This));
 		object = NULL;
 	}
+	SAVE_OPLINE();
 	zend_create_closure(EX_VAR(opline->result.var), func,
 		EX(func)->op_array.scope, called_scope, object);
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h