Annotation of /trunk/koffice/patches/koffice-xpdf-CVE-2007-3387.diff
Parent Directory | Revision Log
Revision 291 -
(hide annotations)
(download)
Thu Aug 16 17:30:30 2007 UTC (17 years, 1 month ago) by niro
File size: 601 byte(s)
Thu Aug 16 17:30:30 2007 UTC (17 years, 1 month ago) by niro
File size: 601 byte(s)
-security update CVE-2007-3387
1 | niro | 291 | --- filters/kword/pdf/xpdf/xpdf/Stream.cc |
2 | +++ filters/kword/pdf/xpdf/xpdf/Stream.cc | ||
3 | @@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream | ||
4 | predLine = NULL; | ||
5 | ok = gFalse; | ||
6 | |||
7 | - if (width <= 0 || nComps <= 0 || nBits <= 0 || | ||
8 | - nComps >= INT_MAX / nBits || | ||
9 | - width >= INT_MAX / nComps / nBits) | ||
10 | - return; | ||
11 | - | ||
12 | nVals = width * nComps; | ||
13 | - if (nVals * nBits + 7 <= 0) | ||
14 | + if (width <= 0 || nComps <= 0 || nBits <= 0 || | ||
15 | + nComps >= 4 || nBits > 16 || | ||
16 | + width >= INT_MAX / nComps || | ||
17 | + nVals >= (INT_MAX - 7) / nBits) | ||
18 | return; | ||
19 | |||
20 | pixBytes = (nComps * nBits + 7) >> 3; |