12345678910111213141516171819202122232425262728293031323334 |
- made apply cleanly based on
- commit 40bade80cbe2af1d0b2cd0420cebd5d5905a2382
- Author: Christos Zoulas <christos@zoulas.com>
- Date: Wed Jun 4 17:23:19 2014 +0000
- Fix incorrect bounds check for sector count. (Francisco Alonso and Jan Kaluza
- at RedHat)
- diff --git a/src/cdf.c b/src/cdf.c
- index 375406c..6652581 100644
- --- a/src/cdf.c
- +++ b/src/cdf.c
- @@ -460,7 +460,8 @@ size_t
- cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size)
- {
- size_t i, j;
- - cdf_secid_t maxsector = (cdf_secid_t)(sat->sat_len * size);
- + cdf_secid_t maxsector = (cdf_secid_t)((sat->sat_len * size)
- + / sizeof(maxsector));
-
- DPRINTF(("Chain:"));
- for (j = i = 0; sid >= 0; i++, j++) {
- @@ -470,8 +470,8 @@ cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size)
- errno = EFTYPE;
- return (size_t)-1;
- }
- - if (sid > maxsector) {
- - DPRINTF(("Sector %d > %d\n", sid, maxsector));
- + if (sid >= maxsector) {
- + DPRINTF(("Sector %d >= %d\n", sid, maxsector));
- errno = EFTYPE;
- return (size_t)-1;
- }
|