Fix for empty space in list(), update tests

bp1222 · bp1222 · commit 2b6d19e7fcf6 · 2017-02-06T23:08:29.000-07:00
diff --git a/Zend/tests/list_references_array.phpt b/Zend/tests/list_references_array.phpt
@@ -65,6 +65,8 @@ array(2) {
   [1]=>
   int(2)
 }
+
+Notice: Undefined offset: 2 in %s on line %d
 array(3) {
   [0]=>
   int(2)
@@ -87,6 +89,8 @@ array(2) {
   ["one"]=>
   &int(2)
 }
+
+Notice: Undefined index: three in %s on line %d
 array(3) {
   ["two"]=>
   int(2)
@@ -130,6 +134,10 @@ array(2) {
   int(2)
 }
 NULL
+
+Notice: Undefined offset: 2 in %s on line %d
+
+Notice: Undefined offset: 0 in %s on line %d
 array(3) {
   [0]=>
   int(1)
@@ -156,6 +164,8 @@ array(3) {
   }
 }
 NULL
+
+Notice: Undefined offset: 1 in %s on line %d
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/list_references_object.phpt b/Zend/tests/list_references_object.phpt
@@ -137,6 +137,8 @@ object(StorageRef)#1 (1) {
     NULL
   }
 }
+
+Notice: Undefined offset: 0 in %s on line %d
 object(StorageRef)#2 (1) {
   ["s":"StorageRef":private]=>
   array(3) {
@@ -166,6 +168,8 @@ object(StorageNoRef)#1 (1) {
 Notice: Undefined offset: 2 in %s on line %d
 
 Notice: Indirect modification of overloaded element of StorageNoRef has no effect in %s on line %d
+
+Notice: Undefined offset: 0 in %s on line %d
 object(StorageNoRef)#2 (1) {
   ["s":"StorageNoRef":private]=>
   array(2) {
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -2821,16 +2821,18 @@ static zend_bool zend_set_list_assign_reference(zend_ast *ast) { /* {{{ */
 
 	for (i = 0; i < list->children; ++i) {
 		zend_ast *elem_ast = list->child[i];
-		zend_ast *var_ast = elem_ast->child[0];
+		if (elem_ast) {
+			zend_ast *var_ast = elem_ast->child[0];
 
-		if (elem_ast->kind == ZEND_AST_ARRAY_ELEM && elem_ast->attr) {
-			has_reference = 1;
-		} else if (elem_ast->kind == ZEND_AST_ARRAY_ELEM && var_ast->kind == ZEND_AST_ARRAY) {
-			has_reference = zend_set_list_assign_reference(var_ast);
-		}
+			if (elem_ast->kind == ZEND_AST_ARRAY_ELEM && elem_ast->attr) {
+				has_reference = 1;
+			} else if (elem_ast->kind == ZEND_AST_ARRAY_ELEM && var_ast->kind == ZEND_AST_ARRAY) {
+				has_reference = zend_set_list_assign_reference(var_ast);
+			}
 
-		if (has_reference) {
-			break;
+			if (has_reference) {
+				break;
+			}
 		}
 	}
 
