Skip to content

Commit 138ebf4

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix failed assertion with throwing __toString in binary const expr
2 parents 6fda0a5 + 80022c0 commit 138ebf4

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ PHP NEWS
1111
prototype). (Bob)
1212
. Fixed bug GH-18581 (Coerce numeric string keys from iterators when argument
1313
unpacking). (ilutov)
14+
. Fixed OSS-Fuzz #434346548 (Failed assertion with throwing __toString in
15+
binary const expr). (ilutov)
1416

1517
- FTP:
1618
. Fix theoretical issues with hrtime() not being available. (nielsdos)

Zend/tests/oss_fuzz_434346548.phpt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--TEST--
2+
OSS-Fuzz #434346548: Failed assertion with throwing __toString in binary const expr
3+
--FILE--
4+
<?php
5+
6+
class Foo {
7+
function __toString() {}
8+
}
9+
10+
function test($y = new Foo() < "") {
11+
var_dump();
12+
}
13+
14+
try {
15+
test();
16+
} catch (Error $e) {
17+
echo $e->getMessage(), "\n";
18+
}
19+
20+
?>
21+
--EXPECT--
22+
Foo::__toString(): Return value must be of type string, none returned

Zend/zend_ast.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,10 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
585585
ret = FAILURE;
586586
} else {
587587
binary_op_type op = get_binary_op(ast->attr);
588-
ret = op(result, &op1, &op2);
588+
op(result, &op1, &op2);
589589
zval_ptr_dtor_nogc(&op1);
590590
zval_ptr_dtor_nogc(&op2);
591+
ret = EG(exception) ? FAILURE : SUCCESS;
591592
}
592593
break;
593594
case ZEND_AST_GREATER:

0 commit comments

Comments
 (0)