com php-src: Fix bug #67716 - Segfault in cdf.c: NEWS ext/fileinfo/libmagic/cdf.c
| From: | Stanislav Malyshev | Date: | Fri, 15 Aug 2014 00:19:03 +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-79874@lists.php.net to get a copy of this message | ||
Commit: 49387b31cf8bda25a85b6932380001be03d6c8b0
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:19:03 -0700
Parents: eab42649ab9c6d949dc8e1ba9e31124e9cfb3b1b
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=49387b31cf8bda25a85b6932380001be03d6c8b0
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 a34ea04..1339ba8 100644
--- a/NEWS
+++ b/NEWS
@@ -6,11 +6,11 @@ PHP NEWS
. Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
- OpenSSL:
- . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads)
+ . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads).
(Daniel Lowrey).
- Date:
- . Fixed bug #66091 (memory leaks in DateTime constructor) (Tjerk).
+ . Fixed bug #66091 (memory leaks in DateTime constructor). (Tjerk).
?? ??? 2014, PHP 5.4.32
@@ -21,11 +21,12 @@ PHP NEWS
- Fileinfo:
. Fixed bug #67705 (extensive backtracking in rule regular expression).
- (CVE-2014-3538) (Remi)
+ (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).
- (CVE-2014-2497) (Remi)
+ (CVE-2014-2497). (Remi)
- Milter:
. Fixed bug #67715 (php-milter does not build and crashes randomly). (Mike)
@@ -40,7 +41,7 @@ PHP NEWS
with control-c). (Dmitry Saprykin, Johannes)
- Sessions:
- . Fixed missing type checks in php_session_create_id (Yussuf Khalil, Stas).
+ . Fixed missing type checks in php_session_create_id. (Yussuf Khalil, Stas).
- SPL:
. Fixed bug #67539 (ArrayIterator use-after-free due to object change during
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;
}