Skip to content

Commit

Permalink
When FLAG_PROPAGATE_PHP_EXCEPTIONS is set, check for unwind or gracef…
Browse files Browse the repository at this point in the history
…ul exit before propagate
  • Loading branch information
chrisbckr committed Jan 16, 2023
1 parent 461230b commit 5a10dec
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
37 changes: 37 additions & 0 deletions tests/issue_497_001.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--TEST--
Test V8::executeString() : Issue #497 (segmentation fault calling PHP exit inside object function)
--SKIPIF--
<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
--FILE--
<?php
class Foo {
function __destruct() {
var_dump('Foo __destruct');
}

function somecall() {
var_dump('Foo somecall');
}

function bar() {
global $v8;
var_dump('Foo bar');
exit;
}
}

$v8 = new \V8Js();
$v8->foo = new Foo();

$JS = <<< EOT
PHP.foo.somecall();
PHP.foo.bar();
EOT;

$v8->executeString($JS, '', \V8JS::FLAG_PROPAGATE_PHP_EXCEPTIONS);
echo 'Not here!!';
?>
--EXPECTF--
string(12) "Foo somecall"
string(7) "Foo bar"
string(14) "Foo __destruct"
2 changes: 1 addition & 1 deletion v8js_object_export.cc
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ static void v8js_call_php_func(zend_object *object, zend_function *method_ptr, c
}

if(EG(exception)) {
if(ctx->flags & V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS) {
if((ctx->flags & V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS) && !zend_is_graceful_exit(EG(exception)) && !zend_is_unwind_exit(EG(exception))) {
zval tmp_zv;
ZVAL_OBJ(&tmp_zv, EG(exception));
return_value = isolate->ThrowException(zval_to_v8js(&tmp_zv, isolate));
Expand Down

0 comments on commit 5a10dec

Please sign in to comment.