Fix bug #81159: Object to int warning when using an object as a string offset

Girgias · Girgias · commit f0fd5922eeb7 · 2021-06-18T18:07:22.000+01:00
Closes GH-7167
diff --git a/NEWS b/NEWS
@@ -7,6 +7,8 @@ PHP                                                                        NEWS
     (cmb, Nikita)
   . Fixed bug #81163 (incorrect handling of indirect vars in __sleep).
     (krakjoe)
+  . Fixed bug #81159 (Object to int warning when using an object as a string offset).
+    (girgias)
 
 - Intl:
   . Fixed bug #72809 (Locale::lookup() wrong result with canonicalize option).
diff --git a/Zend/tests/bug81159.phpt b/Zend/tests/bug81159.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #81159: Object to int warning when using an object as a string offset
+--FILE--
+<?php
+
+$s = 'Hello';
+$o = new stdClass();
+try {
+    $s[$o] = 'A';
+} catch (\Throwable $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump($s[$o]);
+} catch (\Throwable $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+Cannot access offset of type stdClass on string
+Cannot access offset of type stdClass on string
diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/offset_string.phpt
@@ -68,8 +68,6 @@ string(1) "i"
 Warning: String offset cast occurred in %s on line %d
 string(1) "S"
 Cannot access offset of type resource on string
-
-Warning: Object of class stdClass could not be converted to int in %s on line %d
 Cannot access offset of type stdClass on string
 Cannot access offset of type array on string
 Done
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1384,7 +1384,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type
 					return offset;
 				}
 				zend_illegal_string_offset(dim);
-				break;
+				return 0;
 			}
 			case IS_UNDEF:
 				ZVAL_UNDEFINED_OP2();
@@ -1399,7 +1399,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type
 				goto try_again;
 			default:
 				zend_illegal_string_offset(dim);
-				break;
+				return 0;
 		}
 
 		offset = zval_get_long_func(dim);
@@ -2384,7 +2384,8 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
 						return;
 					}
 					zend_illegal_string_offset(dim);
-					break;
+					ZVAL_NULL(result);
+					return;
 				}
 				case IS_UNDEF:
 					ZVAL_UNDEFINED_OP2();
@@ -2401,7 +2402,8 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
 					goto try_string_offset;
 				default:
 					zend_illegal_string_offset(dim);
-					break;
+					ZVAL_NULL(result);
+					return;
 			}
 
 			offset = zval_get_long_func(dim);

Original file line number	Diff line number	Diff line change
`@@ -1384,7 +1384,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type`
`1384`	`1384`	`return offset;`
`1385`	`1385`	`}`
`1386`	`1386`	`zend_illegal_string_offset(dim);`
`1387`		`- break;`
	`1387`	`+ return 0;`
`1388`	`1388`	`}`
`1389`	`1389`	`case IS_UNDEF:`
`1390`	`1390`	`ZVAL_UNDEFINED_OP2();`
`@@ -1399,7 +1399,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type`
`1399`	`1399`	`goto try_again;`
`1400`	`1400`	`default:`
`1401`	`1401`	`zend_illegal_string_offset(dim);`
`1402`		`- break;`
	`1402`	`+ return 0;`
`1403`	`1403`	`}`
`1404`	`1404`
`1405`	`1405`	`offset = zval_get_long_func(dim);`
`@@ -2384,7 +2384,8 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z`
`2384`	`2384`	`return;`
`2385`	`2385`	`}`
`2386`	`2386`	`zend_illegal_string_offset(dim);`
`2387`		`- break;`
	`2387`	`+ ZVAL_NULL(result);`
	`2388`	`+ return;`
`2388`	`2389`	`}`
`2389`	`2390`	`case IS_UNDEF:`
`2390`	`2391`	`ZVAL_UNDEFINED_OP2();`
`@@ -2401,7 +2402,8 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z`
`2401`	`2402`	`goto try_string_offset;`
`2402`	`2403`	`default:`
`2403`	`2404`	`zend_illegal_string_offset(dim);`
`2404`		`- break;`
	`2405`	`+ ZVAL_NULL(result);`
	`2406`	`+ return;`
`2405`	`2407`	`}`
`2406`	`2408`
`2407`	`2409`	`offset = zval_get_long_func(dim);`