1 Adapted for PHP 5.4.16 from
3 From 56754a7f9eba0e4f559b6ca081d9f2a447b3f159 Mon Sep 17 00:00:00 2001
4 From: Stanislav Malyshev <stas@php.net>
5 Date: Sun, 28 Sep 2014 14:19:31 -0700
6 Subject: [PATCH] Fixed bug #68044: Integer overflow in unserialize() (32-bits
11 ext/standard/tests/serialize/bug68044.phpt | 12 ++++++++++++
12 ext/standard/var_unserializer.c | 4 ++--
13 ext/standard/var_unserializer.re | 2 +-
14 4 files changed, 19 insertions(+), 4 deletions(-)
15 create mode 100644 ext/standard/tests/serialize/bug68044.phpt
17 diff --git a/ext/standard/tests/serialize/bug68044.phpt b/ext/standard/tests/serialize/bug68044.phpt
19 index 0000000..031e44e
21 +++ b/ext/standard/tests/serialize/bug68044.phpt
24 +Bug #68044 Integer overflow in unserialize() (32-bits only)
27 + echo unserialize('C:3:"XYZ":18446744075857035259:{}');
31 +Warning: Insufficient data for unserializing - %d required, 1 present in %s/bug68044.php on line 2
33 +Notice: unserialize(): Error at offset 32 of 33 bytes in %s/bug68044.php on line 2
35 diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
36 index 657051f..8129da3 100644
37 --- a/ext/standard/var_unserializer.c
38 +++ b/ext/standard/var_unserializer.c
39 @@ -326,7 +326,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
43 - if (datalen < 0 || (*p) + datalen >= max) {
44 + if (datalen < 0 || (max - (*p)) <= datalen) {
45 zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p)));
48 diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
49 index 1307508..6de1583 100644
50 --- a/ext/standard/var_unserializer.re
51 +++ b/ext/standard/var_unserializer.re
52 @@ -332,7 +332,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
56 - if (datalen < 0 || (*p) + datalen >= max) {
57 + if (datalen < 0 || (max - (*p)) <= datalen) {
58 zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p)));