clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #79777

Browse Source
This commit is contained in:
Nikita Popov 2020-07-04 09:59:42 +02:00
parent 344c077400
commit 49396f817a
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Zend/tests/die_string_cast_exception.phpt Normal file
View File

@ -0,0 +1,13 @@
--TEST--
Bug #79777: String cast exception during die should be handled gracefully
--FILE--
<?php
die(new stdClass);
?>
--EXPECTF--
Fatal error: Uncaught Error: Object of class stdClass could not be converted to string in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d

5
Zend/zend_vm_def.h
View File

@ -6893,7 +6893,10 @@ ZEND_VM_COLD_HANDLER(79, ZEND_EXIT, ANY, ANY)
} while (0);
FREE_OP1();
}
zend_throw_unwind_exit();
if (!EG(exception)) {
zend_throw_unwind_exit();
}
HANDLE_EXCEPTION();
}

8
Zend/zend_vm_execute.h
View File

@ -2322,7 +2322,10 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_EXIT_SPEC_HANDLER
} while (0);
FREE_OP(opline->op1_type, opline->op1.var);
}
zend_throw_unwind_exit();
if (!EG(exception)) {
zend_throw_unwind_exit();
}
HANDLE_EXCEPTION();
}
@ -2476,7 +2479,6 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_dispatch_try
{
/* May be NULL during generator closing (only finally blocks are executed) */
zend_object *ex = EG(exception);
zend_bool is_unwind_exit = ex && zend_is_unwind_exit(ex);
/* Walk try/catch/finally structures upwards, performing the necessary actions */
for (; try_catch_offset != (uint32_t) -1; try_catch_offset--) {
@ -2489,7 +2491,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_dispatch_try
ZEND_VM_JMP_EX(&EX(func)->op_array.opcodes[try_catch->catch_op], 0);
} else if (op_num < try_catch->finally_op) {
if (is_unwind_exit) {
if (ex && zend_is_unwind_exit(ex)) {
/* Don't execute finally blocks on exit (for now) */
continue;
}