Skip to content

Commit e52f57c

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Add test ws
2 parents 731ce6b + 8d7d87c commit e52f57c

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

Zend/tests/objects_034.phpt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
--TEST--
2+
Array object clobbering by user error handler
3+
--FILE--
4+
<?php
5+
class A {
6+
}
7+
8+
set_error_handler(function () {
9+
$GLOBALS['a'] = null;
10+
});
11+
12+
$a = new A;
13+
$a[$c] = 'x' ;
14+
var_dump($a);
15+
16+
$a = new A;
17+
$a[$c] .= 'x' ;
18+
var_dump($a);
19+
20+
$a = new A;
21+
$a[$c][$c] = 'x' ;
22+
var_dump($a);
23+
?>
24+
--EXPECT--
25+
NULL
26+
NULL
27+
NULL

ext/opcache/jit/zend_jit_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@ static void ZEND_FASTCALL zend_jit_assign_dim_op_helper(zval *container, zval *d
13101310
return;
13111311
}
13121312
}
1313-
1313+
13141314
z = obj->handlers->read_dimension(obj, dim, BP_VAR_R, &rv);
13151315
if (z != NULL) {
13161316

0 commit comments

Comments
 (0)