archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #74340

Browse source
This commit is contained in:
Nikita Popov 2017-04-02 13:30:35 +02:00
parent c8034514ed
commit fe46a7da78
3 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -2,6 +2,10 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2017, PHP 7.1.5 ?? ??? 2017, PHP 7.1.5
- Core:
. Fixed bug #74340 (Magic function __get has different behavior in php 7.1.x).
(Nikita)
- GD: - GD:
. Fixed bug #74343 (compile fails on solaris 11 with system gd2 library). . Fixed bug #74343 (compile fails on solaris 11 with system gd2 library).
(krakjoe) (krakjoe)

30
Zend/tests/bug74340.phpt Normal file
View file

@ -0,0 +1,30 @@
--TEST--
Bug #74340: Magic function __get has different behavior in php 7.1.x
--FILE--
<?php
class Test
{
public function __get($var)
{
static $first = true;
echo '__get '.$var.PHP_EOL;
if ($first) {
$first = false;
$this->$var;
$this->{$var.'2'};
$this->$var;
}
}
}
$test = new Test;
$test->test;
?>
--EXPECTF--
__get test
Notice: Undefined property: Test::$test in %s on line %d
__get test2
Notice: Undefined property: Test::$test in %s on line %d

2
Zend/zend_object_handlers.c
View file

@ -545,7 +545,7 @@ ZEND_API uint32_t *zend_get_property_guard(zend_object *zobj, zend_string *membe
ALLOC_HASHTABLE(guards); ALLOC_HASHTABLE(guards);
zend_hash_init(guards, 8, NULL, zend_property_guard_dtor, 0); zend_hash_init(guards, 8, NULL, zend_property_guard_dtor, 0);
/* mark pointer as "special" using low bit */ /* mark pointer as "special" using low bit */
zend_hash_add_new_ptr(guards, member, zend_hash_add_new_ptr(guards, str,
(void*)(((zend_uintptr_t)&zv->u2.property_guard) | 1)); (void*)(((zend_uintptr_t)&zv->u2.property_guard) | 1));
zend_string_release(Z_STR_P(zv)); zend_string_release(Z_STR_P(zv));
ZVAL_ARR(zv, guards); ZVAL_ARR(zv, guards);