From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 1 Jun 2015 09:21:48 +0000 (+0300)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bf76bae40d2f284c7ef9026c6e3883c0678e0fd;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #69732 (can induce segmentation fault with basic php code).
---

8bf76bae40d2f284c7ef9026c6e3883c0678e0fd
diff --cc Zend/tests/bug69732.phpt
index 0000000000,2ea5e58bc9..bc6206d113
mode 000000,100644..100644
--- a/Zend/tests/bug69732.phpt
+++ b/Zend/tests/bug69732.phpt
@@@ -1,0 -1,30 +1,30 @@@
+ --TEST--
+ Bug #69732 (can induce segmentation fault with basic php code)
+ --FILE--
+ <?php
+ class wpq {
+     private $unreferenced;
+  
+     public function __get($name) {
+         return $this->$name . "XXX";
+     }
+ }
+  
+ function ret_assoc() {
+ 	$x = "XXX";
+     return array('foo' => 'bar', $x);
+ }
+  
+ $wpq = new wpq;
+ $wpq->interesting =& ret_assoc();
+ $x = $wpq->interesting;
+ printf("%s\n", $x);
+ --EXPECTF--
+ Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6
+ 
+ Notice: Indirect modification of overloaded property wpq::$interesting has no effect in %sbug69732.php on line 16
+ 
 -Strict Standards: Only variables should be assigned by reference in %sbug69732.php on line 16
++Notice: Only variables should be assigned by reference in %sbug69732.php on line 16
+ 
+ Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6
+ XXX