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

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Property handle read_property exception in fetch_property_address
This commit is contained in:
Nikita Popov 2020-08-26 16:12:56 +02:00
commit e069032e5c
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Zend/tests/exception_during_by_reference_magic_get.phpt Normal file
View File

@ -0,0 +1,23 @@
--TEST--
Exception thrown by __get() during =& assignment
--FILE--
<?php
class Test {
private $x;
public function &__get($name) {
throw new Exception("Foobar");
}
}
$test = new Test;
$y = 5;
try {
$test->x =& $y;
} catch (Exception $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
Foobar

4
Zend/zend_execute.c
View File

@ -2783,6 +2783,10 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c
}
goto end;
}
if (UNEXPECTED(EG(exception))) {
ZVAL_ERROR(result);
goto end;
}
} else if (UNEXPECTED(Z_ISERROR_P(ptr))) {
ZVAL_ERROR(result);
goto end;