Fix handling of sccp exceptions

We should clear the exception *before* we destroy the execute_data.
Add a variation of the test that indirects through another file,
and would crash otherwise.
This commit is contained in:
Nikita Popov 2020-11-27 17:43:24 +01:00
parent a87d620543
commit a505fc627e
3 changed files with 20 additions and 4 deletions

View file

@ -1046,16 +1046,17 @@ static inline int ct_eval_func_call(
for (i = 0; i < num_args; i++) {
zval_ptr_dtor_nogc(EX_VAR_NUM(i));
}
efree(execute_data);
EG(current_execute_data) = prev_execute_data;
int retval = SUCCESS;
if (EG(exception)) {
zval_ptr_dtor(result);
zend_clear_exception();
return FAILURE;
retval = FAILURE;
}
return SUCCESS;
efree(execute_data);
EG(current_execute_data) = prev_execute_data;
return retval;
}
#define SET_RESULT(op, zv) do { \

View file

@ -0,0 +1,2 @@
<?php
var_dump(version_compare('1.2', '2.1', '??'));

View file

@ -0,0 +1,13 @@
--TEST--
Exception thrown during SCCP evaluation, separate file variation
--FILE--
<?php
require __DIR__ . '/sccp_exception2.inc';
?>
--EXPECTF--
Fatal error: Uncaught ValueError: version_compare(): Argument #3 ($operator) must be a valid comparison operator in %s:%d
Stack trace:
#0 %s(%d): version_compare('1.2', '2.1', '??')
#1 %s(%d): require('/home/nikic/php...')
#2 {main}
thrown in %s on line %d