Fix test after serialization change

And move it to a more appropriate location.

diff --git a/NEWS b/NEWS
index 17c1b817815f0d545f4c9bcef709ccee7295de81..3e208f16acc2594de05b308ace615f944a81a30d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ PHP                                                                        NEWS
     non-blocking). (Nikita)
 
 - GMP:
-  . Fixed bug #76470 (Integer Underflow when unserializing GMP and possible
+  . Fixed bug #74670 (Integer Underflow when unserializing GMP and possible
     other classes). (Nikita)
 
 - intl:

diff --git a/ext/standard/tests/strings/bug70436.phpt b/ext/standard/tests/serialize/bug70436.phpt
similarity index 89%
rename from ext/standard/tests/strings/bug70436.phpt
rename to ext/standard/tests/serialize/bug70436.phpt
index 7d6d0f18d9179d2019468e10c8c8a3b5ffa13145..8b0df73d6086e9aa453b58b3835b0ccd118b4894 100644 (file)
--- a/ext/standard/tests/strings/bug70436.phpt
+++ b/ext/standard/tests/serialize/bug70436.phpt
@@ -25,7 +25,7 @@ $fakezval .= "\x01";
 $fakezval .= "\x00";
 $fakezval .= "\x00\x00";
 
-$inner = 'C:3:"obj":3:{ryat';
+$inner = 'C:3:"obj":3:{rya}';
 $exploit = 'a:4:{i:0;i:1;i:1;C:3:"obj":'.strlen($inner).':{'.$inner.'}i:2;s:'.strlen($fakezval).':"'.$fakezval.'";i:3;R:5;}';
 
 $data = unserialize($exploit);
@@ -48,8 +48,6 @@ DONE
 --EXPECTF--
 Notice: unserialize(): Error at offset 0 of 3 bytes in %sbug70436.php on line %d
 
-Notice: unserialize(): Error at offset 16 of 17 bytes in %sbug70436.php on line %d
-
 Notice: unserialize(): Error at offset 93 of 94 bytes in %sbug70436.php on line %d
 bool(false)
 DONE