com php-src: Fix bug #67716 - Segfault in cdf.c: NEWS ext/fileinfo/libmagic/cdf.c

From: Date: Fri, 15 Aug 2014 00:44:19 +0000
Subject: com php-src: Fix bug #67716 - Segfault in cdf.c: NEWS ext/fileinfo/libmagic/cdf.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-79883@lists.php.net to get a copy of this message
Commit: 7ba1409a1aee5925180de546057ddd84ff267947 Author: Remi Collet <rcollet@redhat.com> Thu, 14 Aug 2014 17:19:03 -0700 Committer: Stanislav Malyshev <stas@php.net> Thu, 14 Aug 2014 17:44:19 -0700 Parents: fd28010e20ae051e84884232c550c5ec428f632e Branches: PHP-5.4.32 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7ba1409a1aee5925180de546057ddd84ff267947 Log: Fix bug #67716 - Segfault in cdf.c Bugs: https://bugs.php.net/67716 Changed paths: M NEWS M ext/fileinfo/libmagic/cdf.c Diff: diff --git a/NEWS b/NEWS index 473f96a..9805a71 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ PHP NEWS - Fileinfo: . Fixed bug #67705 (extensive backtracking in rule regular expression). (CVE-2014-3538) (Remi) + . Fixed bug #67716 (Segfault in cdf.c). (CVE-2014-3587) (Remi) - GD: . Fixed bug #66901 (php-gd 'c_color' NULL pointer dereference). diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c index 429f3b9...2c0a2d9 100644 --- a/ext/fileinfo/libmagic/cdf.c +++ b/ext/fileinfo/libmagic/cdf.c @@ -820,7 +820,7 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, q = (const uint8_t *)(const void *) ((const char *)(const void *)p + ofs - 2 * sizeof(uint32_t)); - if (q > e) { + if (q < p || q > e) { DPRINTF(("Ran of the end %p > %p\n", q, e)); goto out; }

« previous php.cvs (#79883) next »