Patch first_effort_to_fix_this for Arrays related Bug #60362

Patch version 2011-12-03 15:51 UTC

Obsoleted by patches:

• fix_disabling_bad_string_offsets, revision 2011-12-04 12:44 UTC

• 2011-12-03 15:51 UTC [diff to current]

Developer: alan@akbkhome.com

Index: Zend/zend_execute.c
===================================================================
--- Zend/zend_execute.c	(revision 320308)
+++ Zend/zend_execute.c	(working copy)
@@ -1150,9 +1150,18 @@
 					switch(Z_TYPE_P(dim)) {
 						/* case IS_LONG: */
 						case IS_STRING:
+							if (IS_LONG != is_numeric_string(Z_STRVAL_P(dim), Z_STRLEN_P(dim), NULL, NULL, -1) && 
+ 								(type != BP_VAR_UNSET) ) {
+								zend_error(E_WARNING, "Invalid string offset");
+								goto convert_to_array;
+				
+							}
+							break;
+						
 						case IS_DOUBLE:
 						case IS_NULL:
 						case IS_BOOL:
+							zend_error(NOTICE, "String offset cast occured");
 							/* do nothing */
 							break;
 						default:
@@ -1260,15 +1269,23 @@
 		case IS_STRING: {
 				zval tmp;
 				zval *ptr;
-
+				int return_empty = 0;
+				
 				if (Z_TYPE_P(dim) != IS_LONG) {
 					switch(Z_TYPE_P(dim)) {
 						/* case IS_LONG: */
 						case IS_STRING:
+							if (IS_LONG != is_numeric_string(Z_STRVAL_P(dim), Z_STRLEN_P(dim), NULL, NULL, -1)) {
+								return_empty = 1;
+								if (type != BP_VAR_IS) { 
+									zend_error(E_WARNING, "Illegal string offset");
+								}
+							}
+							break;
 						case IS_DOUBLE:
-						case IS_NULL:
+						case IS_NULL: 
 						case IS_BOOL:
-							/* do nothing */
+							zend_error(E_NOTICE, "String offset cast occured");
 							break;
 						default:
 							zend_error(E_WARNING, "Illegal offset type");
@@ -1285,9 +1302,9 @@
 				INIT_PZVAL(ptr);
 				Z_TYPE_P(ptr) = IS_STRING;
 
-				if (Z_LVAL_P(dim) < 0 || Z_STRLEN_P(container) <= Z_LVAL_P(dim)) {
-					if (type != BP_VAR_IS) {
-						zend_error(E_NOTICE, "Uninitialized string offset: %ld", Z_LVAL_P(dim));
+				if (return_empty || Z_LVAL_P(dim) < 0 || Z_STRLEN_P(container) <= Z_LVAL_P(dim)) {
+					if (type != BP_VAR_IS && !return_empty) {
+						zend_error(E_NOTICE, "Uninitialized or invalid string offset: %ld", Z_LVAL_P(dim));
 					}
 					Z_STRVAL_P(ptr) = STR_EMPTY_ALLOC();
 					Z_STRLEN_P(ptr) = 0;
Index: Zend/tests/offset_string.phpt
===================================================================
--- Zend/tests/offset_string.phpt	(revision 320308)
+++ Zend/tests/offset_string.phpt	(working copy)
@@ -26,20 +26,30 @@
 ?>
 --EXPECTF--	
 string(1) "i"
+
+Notice: String offset cast occured in %s on line %d
 string(1) "S"
+
+Notice: String offset cast occured in %s on line %d
 string(1) "S"
-string(1) "S"
+
+Warning: Illegal string offset in %s on line %d
+string(0) ""
+
+Notice: String offset cast occured in %s on line %d
 string(1) "i"
+
+Notice: String offset cast occured in %s on line %d
 string(1) "S"
 
 Warning: Illegal offset type in %s on line %d
-string(1) "%s"
+string(1) "n"
 
 Warning: Illegal offset type in %s on line %d
 
 Notice: Object of class stdClass could not be converted to int in %s on line %d
-string(1) "%s"
+string(1) "i"
 
 Warning: Illegal offset type in %s on line %d
 string(1) "i"
-Done
+Done
\ No newline at end of file
Index: Zend/tests/bug39304.phpt
===================================================================
--- Zend/tests/bug39304.phpt	(revision 320308)
+++ Zend/tests/bug39304.phpt	(working copy)
@@ -7,10 +7,10 @@
 echo "I am alive";
 ?>
 --EXPECTF--
-Notice: Uninitialized string offset: 0 in %sbug39304.php on line 3
+Notice: Uninitialized or invalid string offset: 0 in %sbug39304.php on line 3
 
-Notice: Uninitialized string offset: 1 in %sbug39304.php on line 3
+Notice: Uninitialized or invalid string offset: 1 in %sbug39304.php on line 3
 
-Notice: Uninitialized string offset: 0 in %sbug39304.php on line 3
+Notice: Uninitialized or invalid string offset: 0 in %sbug39304.php on line 3
 I am alive
 
Index: Zend/tests/bug39304_2_4.phpt
===================================================================
--- Zend/tests/bug39304_2_4.phpt	(revision 320308)
+++ Zend/tests/bug39304_2_4.phpt	(working copy)
@@ -9,10 +9,10 @@
   var_dump($a,$b);
 ?>
 --EXPECTF--
-Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line 3
+Notice: Uninitialized or invalid string offset: 0 in %sbug39304_2_4.php on line 3
 
-Notice: Uninitialized string offset: 1 in %sbug39304_2_4.php on line 3
+Notice: Uninitialized or invalid string offset: 1 in %sbug39304_2_4.php on line 3
 
-Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line 3
+Notice: Uninitialized or invalid string offset: 0 in %sbug39304_2_4.php on line 3
 string(0) ""
 string(0) ""
Index: Zend/tests/bug39018.phpt
===================================================================
--- Zend/tests/bug39018.phpt	(revision 320308)
+++ Zend/tests/bug39018.phpt	(working copy)
@@ -63,30 +63,42 @@
 ?>
 --EXPECTF--
 
-Notice: Uninitialized string offset: %i in %s on line 6
+Notice: Uninitialized or invalid string offset: %i in %s on line 6
 
-Notice: Uninitialized string offset: 0 in %s on line 10
+Notice: Uninitialized or invalid string offset: 0 in %s on line 10
 
-Notice: Uninitialized string offset: 0 in %s on line 12
+Notice: Uninitialized or invalid string offset: 0 in %s on line 12
 
-Notice: Uninitialized string offset: %i in %s on line 14
+Notice: String offset cast occured in %s on line 14
 
-Notice: Uninitialized string offset: %i in %s on line 16
+Notice: Uninitialized or invalid string offset: %i in %s on line 14
 
-Notice: Uninitialized string offset: 0 in %s on line 18
+Notice: String offset cast occured in %s on line 16
 
-Notice: Uninitialized string offset: 4 in %s on line 28
+Notice: Uninitialized or invalid string offset: %i in %s on line 16
 
-Notice: Uninitialized string offset: 4 in %s on line 34
+Notice: Uninitialized or invalid string offset: 0 in %s on line 18
 
-Notice: Uninitialized string offset: 4 in %s on line 38
+Notice: Uninitialized or invalid string offset: 4 in %s on line 28
 
-Notice: Uninitialized string offset: 4 in %s on line 42
+Notice: Uninitialized or invalid string offset: 4 in %s on line 34
 
-Notice: Uninitialized string offset: 4 in %s on line 46
+Notice: Uninitialized or invalid string offset: 4 in %s on line 38
 
-Notice: Uninitialized string offset: 12 in %s on line 50
+Notice: Uninitialized or invalid string offset: 4 in %s on line 42
 
-Notice: Uninitialized string offset: 12 in %s on line 52
+Notice: Uninitialized or invalid string offset: 4 in %s on line 46
+
+Notice: String offset cast occured in %s on line 50
+
+Notice: Uninitialized or invalid string offset: 12 in %s on line 50
+
+Notice: String offset cast occured in %s on line 52
+
+Notice: Uninitialized or invalid string offset: 12 in %s on line 52
+
+Notice: String offset cast occured in %s on line 54
+
+Notice: String offset cast occured in %s on line 56
 b
 Done
Index: Zend/tests/result_unused.phpt
===================================================================
--- Zend/tests/result_unused.phpt	(revision 320308)
+++ Zend/tests/result_unused.phpt	(working copy)
@@ -24,6 +24,6 @@
 $x->y;
 echo "ok\n";
 --EXPECTF--
-Notice: Uninitialized string offset: 3 in %sresult_unused.php on line 11
+Notice: Uninitialized or invalid string offset: 3 in %sresult_unused.php on line 11
 ok
 
Index: Zend/tests/indexing_001.phpt
===================================================================
--- Zend/tests/indexing_001.phpt	(revision 320308)
+++ Zend/tests/indexing_001.phpt	(working copy)
@@ -71,8 +71,14 @@
   }
 }
 
-Notice: Array to string conversion in %s on line %d
-string(1) "A"
+Warning: Invalid string offset in /home/alan/git/php/Zend/tests/indexing_001.php on line 7
+array(1) {
+  ["foo"]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
 
 Warning: Cannot use a scalar value as an array in %s on line %d
 float(0.1)
Index: Zend/tests/offset_assign.phpt
===================================================================
--- Zend/tests/offset_assign.phpt	(revision 320308)
+++ Zend/tests/offset_assign.phpt	(working copy)
@@ -7,5 +7,15 @@
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
+
+Done
 Fatal error: Cannot use string offset as an array in %s on line %d
+
+THIS IS BROKEN - FIX ME
+
+Warning: Invalid string offset in /home/alan/git/php/Zend/tests/offset_assign.php on line 3
+
+Notice: Undefined index: x in /home/alan/git/php/Zend/tests/offset_assign.php on line 3
+
+Notice: Undefined index: y in /home/alan/git/php/Zend/tests/offset_assign.php on line 3
Index: Zend/tests/str_offset_001.phpt
===================================================================
--- Zend/tests/str_offset_001.phpt	(revision 320308)
+++ Zend/tests/str_offset_001.phpt	(working copy)
@@ -24,28 +24,28 @@
 foo($str[2][1]);
 ?>
 --EXPECTF--
-Notice: Uninitialized string offset: -1 in %sstr_offset_001.php on line 7
+Notice: Uninitialized or invalid string offset: -1 in %sstr_offset_001.php on line 7
 string(0) ""
 string(1) "a"
 string(1) "b"
 string(1) "c"
 
-Notice: Uninitialized string offset: 3 in %sstr_offset_001.php on line 11
+Notice: Uninitialized or invalid string offset: 3 in %sstr_offset_001.php on line 11
 string(0) ""
 string(1) "b"
 
-Notice: Uninitialized string offset: 1 in %sstr_offset_001.php on line 13
+Notice: Uninitialized or invalid string offset: 1 in %sstr_offset_001.php on line 13
 string(0) ""
 
-Notice: Uninitialized string offset: -1 in %sstr_offset_001.php on line 15
+Notice: Uninitialized or invalid string offset: -1 in %sstr_offset_001.php on line 15
 string(0) ""
 string(1) "a"
 string(1) "b"
 string(1) "c"
 
-Notice: Uninitialized string offset: 3 in %sstr_offset_001.php on line 19
+Notice: Uninitialized or invalid string offset: 3 in %sstr_offset_001.php on line 19
 string(0) ""
 string(1) "b"
 
-Notice: Uninitialized string offset: 1 in %sstr_offset_001.php on line 21
+Notice: Uninitialized or invalid string offset: 1 in %sstr_offset_001.php on line 21
 string(0) ""
Index: Zend/tests/bug24773.phpt
===================================================================
--- Zend/tests/bug24773.phpt	(revision 320308)
+++ Zend/tests/bug24773.phpt	(working copy)
@@ -6,4 +6,6 @@
 	unset($array["lvl1"]["lvl2"]["b"]);
 ?>
 --EXPECTF--
+Warning: String offset cast occured in %s on line %d
+
 Fatal error: Cannot unset string offsets in %s on line %d
Index: Zend/tests/bug31098.phpt
===================================================================
--- Zend/tests/bug31098.phpt	(revision 320308)
+++ Zend/tests/bug31098.phpt	(working copy)
@@ -24,7 +24,7 @@
 echo isset($simpleString["16"])?"ok\n":"bug\n";
 echo isset($simpleString["17"])?"bug\n":"ok\n";
 echo $simpleString->wrong === null?"ok\n":"bug\n";
-echo $simpleString["wrong"] === "B"?"ok\n":"bug\n";
+echo $simpleString["wrong"] === "B"?"bug\n":"ok\n";
 echo $simpleString["0"] === "B"?"ok\n":"bug\n";
 $simpleString["wrong"] = "f";
 echo $simpleString["0"] === "f"?"ok\n":"bug\n";
@@ -44,8 +44,15 @@
 ok
 ok
 
-Notice: Trying to get property of non-object in %sbug31098.php on line %d
+Notice: Trying to get property of non-object in /home/alan/git/php/Zend/tests/bug31098.php on line 23
 ok
+
+Warning: Illegal string offset in /home/alan/git/php/Zend/tests/bug31098.php on line 24
 ok
 ok
-ok
+
+Warning: Invalid string offset in /home/alan/git/php/Zend/tests/bug31098.php on line 26
+
+Notice: Undefined offset: 0 in /home/alan/git/php/Zend/tests/bug31098.php on line 27
+FIXME 
+bug
\ No newline at end of file