com php-src: Fixed bug #68044: Integer overflow in unserialize() (32-bits only): ext/standard/tests/serialize/bug68044.phpt ext/standard/
var_unserializer.c ext/standard/var_unserializer.re

Commit: 88eb7ea47dd6d23378b116aa76428ef4907c5373 Author: Stanislav Malyshev <stas@php.net> Sun, 28 Sep 2014 14:19:31 -0700 Parents: 2142d78281fe093043b50897d8a22f00910dfd0c Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=88eb7ea47dd6d23378b116aa76428ef4907c5373 Log: Fixed bug #68044: Integer overflow in unserialize() (32-bits only) Bugs: https://bugs.php.net/68044 Changed paths: A ext/standard/tests/serialize/bug68044.phpt M ext/standard/var_unserializer.c M ext/standard/var_unserializer.re Diff: diff --git a/ext/standard/tests/serialize/bug68044.phpt b/ext/standard/tests/serialize/bug68044.phpt new file mode 100644 index 0000000..031e44e --- /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 8b5392a..8b51a20 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 3a1b910..ef553ff 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; }