summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-09-12 18:18:44 +0200
committerAnatol Belski <ab@php.net>2017-09-12 18:18:44 +0200
commitfcad6a97b860281f0cc13e89d8b272beb75046e5 (patch)
treed1482a8a916dbfacca80baf56b45db6019c54f9b
parent7f01872a24c388434ab5cc928f0b6142f4822012 (diff)
parent7674b5e5749e8c0076357167ca553f153c94e6d1 (diff)
downloadphp-git-fcad6a97b860281f0cc13e89d8b272beb75046e5.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix test failure on 32-bit
-rw-r--r--ext/standard/tests/serialize/bug74103.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/serialize/bug74103.phpt b/ext/standard/tests/serialize/bug74103.phpt
index 8123cff144..c1e54651f1 100644
--- a/ext/standard/tests/serialize/bug74103.phpt
+++ b/ext/standard/tests/serialize/bug74103.phpt
@@ -5,5 +5,5 @@ Bug #74103: heap-use-after-free when unserializing invalid array size
var_dump(unserialize('a:7:{i:0;i:04;s:1:"a";i:2;i:9617006;i:4;s:1:"a";i:4;s:1:"a";R:5;s:1:"7";R:3;s:1:"a";R:5;;s:18;}}'));
?>
--EXPECTF--
-Notice: unserialize(): Error at offset 64 of 96 bytes in %s on line %d
+Notice: unserialize(): Error at offset %d of %d bytes in %s on line %d
bool(false)