mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #43175 (__destruct() throwing an exception with __call() causes segfault)

Browse Source
This commit is contained in:
Dmitry Stogov 2007-11-06 14:56:14 +00:00
parent 552b964e22
commit 52f25f6132
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Zend/tests/bug43175.phpt Executable file
View File

@ -0,0 +1,24 @@
--TEST--
Bug #43175 (__destruct() throwing an exception with __call() causes segfault)
--FILE--
<?php
class foobar {
public function __destruct() {
throw new Exception();
}
public function __call($m, $a) {
return $this;
}
}
function foobar() {
return new foobar();
}
try {
foobar()->unknown();
} catch (Exception $e) {
echo "__call via traditional factory should be caught\n";
}
?>
--EXPECT--
__call via traditional factory should be caught

5
Zend/zend_vm_def.h
View File

@ -2092,6 +2092,9 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
}
}
EX(function_state).function = (zend_function *) EX(op_array);
EG(function_state_ptr) = &EX(function_state);
if (EG(This)) {
if (EG(exception) && IS_CTOR_CALL(EX(called_scope))) {
if (IS_CTOR_USED(EX(called_scope))) {
@ -2115,8 +2118,6 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
EG(called_scope) = current_called_scope;
}
EX(function_state).function = (zend_function *) EX(op_array);
EG(function_state_ptr) = &EX(function_state);
zend_ptr_stack_clear_multiple(TSRMLS_C);
if (EG(exception)) {

5
Zend/zend_vm_execute.h
View File

@ -275,6 +275,9 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
}
}
EX(function_state).function = (zend_function *) EX(op_array);
EG(function_state_ptr) = &EX(function_state);
if (EG(This)) {
if (EG(exception) && IS_CTOR_CALL(EX(called_scope))) {
if (IS_CTOR_USED(EX(called_scope))) {
@ -298,8 +301,6 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
EG(called_scope) = current_called_scope;
}
EX(function_state).function = (zend_function *) EX(op_array);
EG(function_state_ptr) = &EX(function_state);
zend_ptr_stack_clear_multiple(TSRMLS_C);
if (EG(exception)) {