com php-src: Merge branch 'PHP-5.6': Zend/tests/bug69732.phpt
| From: | Dmitry Stogov | Date: | Mon, 01 Jun 2015 09:21:48 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': Zend/tests/bug69732.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87038@lists.php.net to get a copy of this message | ||
Commit: 8bf76bae40d2f284c7ef9026c6e3883c0678e0fd
Author: Dmitry Stogov <dmitry@zend.com> Mon, 1 Jun 2015 12:21:48 +0300
Parents: 1654442ac3e87388829981d551af6093b229e071 f863d89b5cc991ebfbb69caacc724ad90513924b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8bf76bae40d2f284c7ef9026c6e3883c0678e0fd
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #69732 (can induce segmentation fault with basic php code).
Bugs:
https://bugs.php.net/69732
Changed paths:
AM Zend/tests/bug69732.phpt
Diff:
diff --cc Zend/tests/bug69732.phpt
index 0000000,2ea5e58..bc6206d
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