clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixed bug #70321 (Magic getter breaks reference to array property)"

Browse Source 
This reverts commit 66754585f8.
This commit is contained in:
Xinchen Hui 2015-08-23 10:40:28 +08:00
parent 66754585f8
commit e26a04f9ec
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -7,7 +7,6 @@ PHP NEWS
. Fixed bug #70300 (Syntactical inconsistency with new group use syntax).
(marcio dot web2 at gmail dot com)
. Fixed bug causing exception traces with anon classes to be truncated. (Bob)
. Fixed bug #70321 (Magic getter breaks reference to array property). (Bob)
- PDO_OCI:
. Fixed bug #70308 (PDO::ATTR_PREFETCH is ignored). (Chris Jones)

31
Zend/tests/bug70321.phpt
View File

@ -1,31 +0,0 @@
--TEST--
Bug #70321 (Magic getter breaks reference to array property)
--FILE--
<?php
class foo {
private $bar;
public function __construct() {
$this->bar = new bar();
}
public function &__get($key) {
$bar = $this->bar;
// no direct reference to $this->bar
return $bar;
}
}
class bar { public $baz = []; }
$foo = new foo();
$foo->bar->baz[] = function() {};
var_dump($foo->bar->baz);
?>
--EXPECTF--
array(1) {
[0]=>
object(Closure)#%d (0) {
}
}

2
Zend/zend_execute.c
View File

@ -89,7 +89,7 @@ static const zend_internal_function zend_pass_function = {
#define zval_ptr_dtor(zv) i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC)
#define READY_TO_DESTROY(zv) \
(EXPECTED(zv) && Z_REFCOUNTED_P(zv) && Z_REFCOUNT_P(zv) == 1 && (EXPECTED(Z_ISREF_P(zv) == 0) || Z_REFCOUNTED_P(Z_REFVAL_P(zv)) && Z_REFCOUNT_P(Z_REFVAL_P(zv)) == 1))
(UNEXPECTED(zv) && Z_REFCOUNTED_P(zv) && Z_REFCOUNT_P(zv) == 1)
#define EXTRACT_ZVAL_PTR(zv, check_null) do { \
zval *__zv = (zv); \