Fixed bug #72943 (assign_dim on string doesn't reset hval)

laruence · laruence · commit c67fa3c91d31 · 2016-08-26T18:30:08.000+08:00
diff --git a/NEWS b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ?? ??? 2016 PHP 7.0.11
 
 - Core:
+  . Fixed bug #72943 (assign_dim on string doesn't reset hval). (Laruence)
   . Fixed bug #72911 (Memleak in zend_binary_assign_op_obj_helper). (Laruence)
   . Fixed bug #72813 (Segfault with __get returned by ref). (Laruence)
   . Fixed bug #72767 (PHP Segfaults when trying to expand an infinite operator).
diff --git a/Zend/tests/bug72943.phpt b/Zend/tests/bug72943.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #72943 (assign_dim on string doesn't reset hval)
+--FILE--
+<?php
+$array = array("test" => 1);
+
+$a = "lest";
+var_dump($array[$a]);
+$a[0] = "f";
+var_dump($array[$a]);
+$a[0] = "t";
+var_dump($array[$a]);
+?>
+--EXPECTF--
+Notice: Undefined index: lest in %sbug72943.php on line %d
+NULL
+
+Notice: Undefined index: fest in %sbug72943.php on line %d
+NULL
+int(1)
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1335,6 +1335,7 @@ static void zend_assign_to_string_offset(zval *str, zend_long offset, zval *valu
 		zend_string_release(tmp);
 	} else {
 		Z_STRVAL_P(str)[offset] = Z_STRVAL_P(value)[0];
+		zend_string_forget_hash_val(Z_STR_P(str));
 	}
 	/*
 	 * the value of an assignment to a string offset is undefined

Original file line number	Diff line number	Diff line change
`@@ -1335,6 +1335,7 @@ static void zend_assign_to_string_offset(zval str, zend_long offset, zval valu`
`1335`	`1335`	`zend_string_release(tmp);`
`1336`	`1336`	`} else {`
`1337`	`1337`	`Z_STRVAL_P(str)[offset] = Z_STRVAL_P(value)[0];`
	`1338`	`+ zend_string_forget_hash_val(Z_STR_P(str));`
`1338`	`1339`	`}`
`1339`	`1340`	`/*`
`1340`	`1341`	`* the value of an assignment to a string offset is undefined`