From d97c0353f92b8f8991338bd3455cadde8734887c Mon Sep 17 00:00:00 2001 From: David Carlier Date: Wed, 18 Nov 2026 18:25:03 +0000 Subject: [PATCH 1/2] Zend: ZEND_CLONE null dereference when the clone handler returns NULL. ZEND_CLONE stored the clone handler's return value unchecked. A handler that threw and returned NULL, as zend_ffi_free_clone_obj() does, left an IS_OBJECT result with a null pointer that ZEND_HANDLE_EXCEPTION released. The uri clone handler hit it once GH-25408 kept the opline of a delayed OOM, which caused its revert. The result is now left undefined. --- .../clone/clone_handler_returning_null.phpt | 21 +++++ Zend/zend_vm_def.h | 9 ++- Zend/zend_vm_execute.h | 78 +++++++++++++++++-- 3 files changed, 99 insertions(+), 9 deletions(-) create mode 100644 Zend/tests/clone/clone_handler_returning_null.phpt diff --git a/Zend/tests/clone/clone_handler_returning_null.phpt b/Zend/tests/clone/clone_handler_returning_null.phpt new file mode 100644 index 000000000000..bf68c5fc6db2 --- /dev/null +++ b/Zend/tests/clone/clone_handler_returning_null.phpt @@ -0,0 +1,21 @@ +--TEST-- +clone of an object whose clone handler throws and returns NULL +--EXTENSIONS-- +ffi +--INI-- +ffi.enable=1 +--FILE-- +new("int[2]", false); +FFI::free($p); +try { + $q = clone $p; +} catch (Throwable $e) { + echo $e::class, ': ', $e->getMessage(), PHP_EOL; +} +echo "done", PHP_EOL; +?> +--EXPECT-- +FFI\Exception: Use after free() +done diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 0a96afdb3dcf..ef1458072cf9 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -6067,7 +6067,14 @@ ZEND_VM_COLD_CONST_HANDLER(110, ZEND_CLONE, CONST|TMPVAR|UNUSED|THIS|CV, ANY) } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + FREE_OP1(); + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); FREE_OP1(); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index dd00d04f6bcb..594633e8629e 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5328,7 +5328,15 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV ZEND_ } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + + + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -15859,7 +15867,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV ZEND_CLONE_SPEC_TM } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -34362,7 +34377,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV ZEND_CLONE_SPEC_UN } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + + + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -42078,7 +42101,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV ZEND_CLONE_SPEC_CV } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + + + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -61066,7 +61097,15 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV ZEND_CLONE } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + + + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -71495,7 +71534,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV ZEND_CLONE_SPEC_TMPVAR_ } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -89898,7 +89944,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV ZEND_CLONE_SPEC_UNUSED_ } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + + + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -97614,7 +97668,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV ZEND_CLONE_SPEC_CV_TAIL } } - ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(zobj)); + zend_object *cloned = clone_call(zobj); + if (UNEXPECTED(!cloned)) { + ZEND_ASSERT(EG(exception)); + + + ZVAL_UNDEF(EX_VAR(opline->result.var)); + HANDLE_EXCEPTION(); + } + ZVAL_OBJ(EX_VAR(opline->result.var), cloned); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); From 42d0a1cddc344a9f9a43fa42f5e117d9ea78cb79 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Wed, 18 Nov 2026 22:36:30 +0000 Subject: [PATCH 2/2] update test location --- .../clone => ext/ffi/tests}/clone_handler_returning_null.phpt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {Zend/tests/clone => ext/ffi/tests}/clone_handler_returning_null.phpt (100%) diff --git a/Zend/tests/clone/clone_handler_returning_null.phpt b/ext/ffi/tests/clone_handler_returning_null.phpt similarity index 100% rename from Zend/tests/clone/clone_handler_returning_null.phpt rename to ext/ffi/tests/clone_handler_returning_null.phpt