com php-src: Fix use of UNDEF instead of NULL in read_dimensi on: Zend/tests/ArrayAccess_indirect_append.phpt Zen d/tests/bug69955.phpt
Zend/zend_object_handle rs.c
| From: | Nikita Popov | Date: | Sun, 20 Mar 2016 12:33:17 +0000 |
| Subject: | com php-src: Fix use of UNDEF instead of NULL in read_dimensi on: Zend/tests/ArrayAccess_indirect_append.phpt Zen d/tests/bug69955.phpt Zend/zend_object_handle rs.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91426@lists.php.net to get a copy of this message | ||
Commit: 1f6d27d3d2cf8a5113946a55a297441bb4c70ddf
Author: Nikita Popov <nikic@php.net> Sun, 20 Mar 2016 12:58:58 +0100
Parents: 9564998e490092fdefa6630944e38692c75e30de
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f6d27d3d2cf8a5113946a55a297441bb4c70ddf
Log:
Fix use of UNDEF instead of NULL in read_dimension
Changed paths:
A Zend/tests/ArrayAccess_indirect_append.phpt
M Zend/tests/bug69955.phpt
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/tests/ArrayAccess_indirect_append.phpt
b/Zend/tests/ArrayAccess_indirect_append.phpt
new file mode 100644
index 0000000..6f3da7c
--- /dev/null
+++ b/Zend/tests/ArrayAccess_indirect_append.phpt
@@ -0,0 +1,43 @@
+--TEST--
+Using indirect append on ArrayAccess object
+--FILE--
+<?php
+
+class AA implements ArrayAccess {
+ private $data = [];
+ public function &offsetGet($name) {
+ if (null === $name) {
+ return $this->data[];
+ } else {
+ return $this->data[$name];
+ }
+ }
+ public function offsetSet($name, $value) {
+ $this->data[$name] = $value;
+ }
+ public function offsetUnset($name) {}
+ public function offsetExists($name) {}
+}
+
+$aa = new AA;
+$aa[3] = 1;
+$aa[][][0] = 2;
+var_dump($aa);
+
+?>
+--EXPECT--
+object(AA)#1 (1) {
+ ["data":"AA":private]=>
+ array(2) {
+ [3]=>
+ int(1)
+ [4]=>
+ array(1) {
+ [0]=>
+ array(1) {
+ [0]=>
+ int(2)
+ }
+ }
+ }
+}
diff --git a/Zend/tests/bug69955.phpt b/Zend/tests/bug69955.phpt
index b6d7424..33c3685 100644
--- a/Zend/tests/bug69955..phpt
+++ b/Zend/tests/bug69955.phpt
@@ -27,8 +27,6 @@ $c10 = new C10;
var_dump($c10[] += 5);
--EXPECTF--
Inside C10::offsetGet
-
-Notice: Undefined variable: offset in %sbug69955.php on line 10
NULL
Inside C10::offsetSet
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index c66f8ad..091a0a0 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -712,7 +712,7 @@ zval *zend_std_read_dimension(zval *object, zval *offset, int type, zval *rv) /*
if (EXPECTED(instanceof_function_ex(ce, zend_ce_arrayaccess, 1) != 0)) {
if(offset == NULL) {
/* [] construct */
- ZVAL_UNDEF(&tmp);
+ ZVAL_NULL(&tmp);
offset = &tmp;
} else {
SEPARATE_ARG_IF_REF(offset);