|
 |
2067da |
From 40ef6e07e0b2cdced57c506e08cf18f47122292d Mon Sep 17 00:00:00 2001
|
|
|
2067da |
From: Remi Collet <remi@php.net>
|
|
|
2067da |
Date: Tue, 10 Jun 2014 14:22:04 +0200
|
|
|
2067da |
Subject: [PATCH] Bug #67412 fileinfo: cdf_count_chain insufficient
|
|
|
2067da |
boundary check
|
|
|
2067da |
|
|
|
2067da |
Upstream:
|
|
|
2067da |
https://github.com/file/file/commit/40bade80cbe2af1d0b2cd0420cebd5d5905a2382
|
|
|
2067da |
---
|
|
|
2067da |
ext/fileinfo/libmagic/cdf.c | 7 ++++---
|
|
|
2067da |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
2067da |
|
|
|
2067da |
diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
|
|
|
2067da |
index c9a5d50..ee467a6 100644
|
|
|
2067da |
--- a/ext/fileinfo/libmagic/cdf.c
|
|
|
2067da |
+++ b/ext/fileinfo/libmagic/cdf.c
|
|
|
2067da |
@@ -470,7 +470,8 @@ size_t
|
|
|
2067da |
cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size)
|
|
|
2067da |
{
|
|
|
2067da |
size_t i, j;
|
|
|
2067da |
- cdf_secid_t maxsector = (cdf_secid_t)(sat->sat_len * size);
|
|
|
2067da |
+ cdf_secid_t maxsector = (cdf_secid_t)((sat->sat_len * size)
|
|
|
2067da |
+ / sizeof(maxsector));
|
|
|
2067da |
|
|
|
2067da |
DPRINTF(("Chain:"));
|
|
|
2067da |
for (j = i = 0; sid >= 0; i++, j++) {
|
|
|
2067da |
@@ -480,8 +481,8 @@ cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size)
|
|
|
2067da |
errno = EFTYPE;
|
|
|
2067da |
return (size_t)-1;
|
|
|
2067da |
}
|
|
|
2067da |
- if (sid > maxsector) {
|
|
|
2067da |
- DPRINTF(("Sector %d > %d\n", sid, maxsector));
|
|
|
2067da |
+ if (sid >= maxsector) {
|
|
|
2067da |
+ DPRINTF(("Sector %d >= %d\n", sid, maxsector));
|
|
|
2067da |
errno = EFTYPE;
|
|
|
2067da |
return (size_t)-1;
|
|
|
2067da |
}
|
|
|
2067da |
--
|
|
|
2067da |
1.9.2
|
|
|
2067da |
|