From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 13 Jan 2017 05:04:37 +0000 (+0800)
Subject: Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)
X-Git-Tag: php-7.1.2RC1~85^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04379bcb1df25a9f9cc1d440f5c12105b9fbaf97;p=php

Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)
---

diff --git a/NEWS b/NEWS
index efbee5e717..27788427d4 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,10 @@ PHP                                                                        NEWS
 ?? ??? 2017 PHP 7.0.16
 
 - Core:
+  . Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference).
+    (Laruence)
   . Fixed bug #73876 (Crash when exporting **= in expansion of assign op).
-  (Sara)
+    (Sara)
 
 - FPM:
   . Fixed bug #67583 (double fastcgi_end_request on max_children limit).
diff --git a/Zend/tests/bug73916.phpt b/Zend/tests/bug73916.phpt
new file mode 100644
index 0000000000..ba2567ed0c
--- /dev/null
+++ b/Zend/tests/bug73916.phpt
@@ -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]
diff --git a/Zend/zend.c b/Zend/zend.c
index 3f3ca75e38..2a47e9244b 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -312,6 +312,9 @@ ZEND_API void zend_print_flat_zval_r(zval *expr) /* {{{ */
 			ZEND_PUTS(")");
 			break;
 		}
+		case IS_REFERENCE:
+			zend_print_flat_zval_r(Z_REFVAL_P(expr));
+			break;
 		default:
 			zend_print_variable(expr);
 			break;