summaryrefslogtreecommitdiffstats
path: root/php-upstream.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-upstream.patch')
-rw-r--r--php-upstream.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/php-upstream.patch b/php-upstream.patch
new file mode 100644
index 0000000..4b847a0
--- /dev/null
+++ b/php-upstream.patch
@@ -0,0 +1,27 @@
+From 3bc12268041bdeec9941c99f08b71620f7572eb0 Mon Sep 17 00:00:00 2001
+From: Dmitry Stogov <dmitry@zend.com>
+Date: Tue, 15 Aug 2017 13:12:54 +0300
+Subject: [PATCH] Made test 32/64-bit independent
+
+---
+ ext/standard/tests/serialize/bug74103.phpt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ext/standard/tests/serialize/bug74103.phpt b/ext/standard/tests/serialize/bug74103.phpt
+index 3d474b3..8123cff 100644
+--- a/ext/standard/tests/serialize/bug74103.phpt
++++ b/ext/standard/tests/serialize/bug74103.phpt
+@@ -2,8 +2,8 @@
+ Bug #74103: heap-use-after-free when unserializing invalid array size
+ --FILE--
+ <?php
+-var_dump(unserialize('a:7:{i:0;i:04;s:1:"a";i:2;i:00009617006;i:4;s:1:"a";i:4;s:1:"a";R:5;s:1:"7";R:3;s:1:"a";R:5;;s:18;}}'));
++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 68 of 100 bytes in %s on line %d
++Notice: unserialize(): Error at offset 64 of 96 bytes in %s on line %d
+ bool(false)
+--
+2.1.4
+