Merge branch 'PHP-7.0'

Metabolix · Nov 4, 2015 · d598e1b · d598e1b
2 parents 5385478 + e4ac4e7
commit d598e1b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/ext/spl/spl_engine.c b/ext/spl/spl_engine.c
@@ -42,6 +42,7 @@ PHPAPI zend_long spl_offset_convert_to_long(zval *offset) /* {{{ */
 {
 	zend_ulong idx;
 
+try_again:
 	switch (Z_TYPE_P(offset)) {
 	case IS_STRING:
 		if (ZEND_HANDLE_NUMERIC(Z_STR_P(offset), idx)) {
@@ -56,6 +57,9 @@ PHPAPI zend_long spl_offset_convert_to_long(zval *offset) /* {{{ */
 		return 0;
 	case IS_TRUE:
 		return 1;
+	case IS_REFERENCE:
+		offset = Z_REFVAL_P(offset);
+		goto try_again;
 	case IS_RESOURCE:
 		return Z_RES_HANDLE_P(offset);
 	}

diff --git a/ext/spl/tests/bug70853.phpt b/ext/spl/tests/bug70853.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #70853 (SplFixedArray throws exception when using ref variable as index)
+--FILE--
+<?php
+
+$list = new SplFixedArray(10);
+$ndx = 1;
+$ndx2 =& $ndx;
+$list[$ndx] = 123;	// This throws an exception;
+$list[$ndx2] = 123;	// as does this, to.
+echo 'ok';
+
+?>
+--EXPECT--
+ok