diff options
author | Stanislav Malyshev <stas@php.net> | 2014-09-28 14:19:31 -0700 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2014-10-15 13:31:48 +0200 |
commit | 2d7461f7bf5e4a7a134fdb13bda4ba6143ab13e3 (patch) | |
tree | 8baba09e7be52b6d243e4d14a8338f0df65fb84f | |
parent | 5f64da15bb9c292e610454492af11975780b5eef (diff) | |
download | php-git-2d7461f7bf5e4a7a134fdb13bda4ba6143ab13e3.tar.gz |
Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
Conflicts:
ext/standard/var_unserializer.c
-rw-r--r-- | ext/standard/tests/serialize/bug68044.phpt | 12 | ||||
-rw-r--r-- | ext/standard/var_unserializer.c | 4 | ||||
-rw-r--r-- | ext/standard/var_unserializer.re | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/ext/standard/tests/serialize/bug68044.phpt b/ext/standard/tests/serialize/bug68044.phpt new file mode 100644 index 0000000000..031e44e149 --- /dev/null +++ b/ext/standard/tests/serialize/bug68044.phpt @@ -0,0 +1,12 @@ +--TEST-- +Bug #68044 Integer overflow in unserialize() (32-bits only) +--FILE-- +<?php + echo unserialize('C:3:"XYZ":18446744075857035259:{}'); +?> +===DONE== +--EXPECTF-- +Warning: Insufficient data for unserializing - %d required, 1 present in %s/bug68044.php on line 2 + +Notice: unserialize(): Error at offset 32 of 33 bytes in %s/bug68044.php on line 2 +===DONE== diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 8b5392a9d7..8b51a20ace 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Fri Apr 18 15:07:27 2014 */ +/* Generated by re2c 0.13.5 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -371,7 +371,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce) (*p) += 2; - if (datalen < 0 || (*p) + datalen >= max) { + if (datalen < 0 || (max - (*p)) <= datalen) { zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p))); return 0; } diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 3a1b910953..ef553ffb53 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -375,7 +375,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce) (*p) += 2; - if (datalen < 0 || (*p) + datalen >= max) { + if (datalen < 0 || (max - (*p)) <= datalen) { zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p))); return 0; } |