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

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  Remove redundant reference handling
  Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)
This commit is contained in:
Xinchen Hui 2017-01-13 13:05:51 +08:00
commit 1cdcf5bafb
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Zend/tests/bug73916.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
Bug #73916 (zend_print_flat_zval_r doesn't consider reference)
--FILE--
<?php
$a = array('a');
class b{};
$b = new b;
$test[] =& $a;
$test[] =& $b;
test($test);
function test() {
debug_print_backtrace();
}
?>
--EXPECTF--
#0 test(Array ([0] => Array ([0] => a),[1] => b Object ())) called at [%sbug73916.php:%d]

1
Zend/zend.c
View file

@ -384,7 +384,6 @@ ZEND_API void zend_print_flat_zval_r(zval *expr) /* {{{ */
static void zend_print_zval_r_to_buf(smart_str *buf, zval *expr, int indent) /* {{{ */ static void zend_print_zval_r_to_buf(smart_str *buf, zval *expr, int indent) /* {{{ */
{ {
ZVAL_DEREF(expr);
switch (Z_TYPE_P(expr)) { switch (Z_TYPE_P(expr)) {
case IS_ARRAY: case IS_ARRAY:
smart_str_appends(buf, "Array\n"); smart_str_appends(buf, "Array\n");