com php-src: Fix bug #67326 fileinfo: cdf_r ead_short_sector insufficient boundary check: ext /fileinfo/libmagic/cdf.c
| From: | Remi Collet | Date: | Tue, 03 Jun 2014 09:05:00 +0000 |
| Subject: | com php-src: Fix bug #67326 fileinfo: cdf_r ead_short_sector insufficient boundary check: ext /fileinfo/libmagic/cdf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78666@lists.php.net to get a copy of this message | ||
Commit: 4fcb9a9d1b1063a65fbeb27395de4979c75bd962
Author: Remi Collet <remi@php.net> Tue, 3 Jun 2014 11:05:00 +0200
Parents: 38be99b739c6ad55b01fe304a083e7a1e36c05ee
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4fcb9a9d1b1063a65fbeb27395de4979c75bd962
Log:
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
Upstream fix https://github.com/file/file/commit/6d209c1c489457397a5763bca4b28e43aac90391.patch
Only revelant part applied
Bugs:
https://bugs.php.net/67326
Changed paths:
M ext/fileinfo/libmagic/cdf.c
Diff:
diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
index 4712e84..16649f1 100644
--- a/ext/fileinfo/libmagic/cdf.c
+++ b/ext/fileinfo/libmagic/cdf.c
@@ -365,10 +365,10 @@ cdf_read_short_sector(const cdf_stream_t *sst, void *buf, size_t offs,
size_t ss = CDF_SHORT_SEC_SIZE(h);
size_t pos = CDF_SHORT_SEC_POS(h, id);
assert(ss == len);
- if (pos > CDF_SEC_SIZE(h) * sst->sst_len) {
+ if (pos + len > CDF_SEC_SIZE(h) * sst->sst_len) {
DPRINTF(("Out of bounds read %" SIZE_T_FORMAT "u > %"
SIZE_T_FORMAT "u\n",
- pos, CDF_SEC_SIZE(h) * sst->sst_len));
+ pos + len, CDF_SEC_SIZE(h) * sst->sst_len));
return -1;
}
(void)memcpy(((char *)buf) + offs,