Attachment 159239 Details for Bug 248194 – Proposed upstream fix

[patch] Proposed upstream fix

xpdf-3.02pl1.patch (text/plain), 981 bytes, created by Josh Bressers on 2007-07-13 20:25:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2007-07-13 20:25:28 UTC

Size: 981 bytes

patch

obsolete

>*** xpdf-3.02-orig/xpdf/Stream.cc	Tue Feb 27 14:05:52 2007
>--- xpdf-3.02/xpdf/Stream.cc	Thu Jul 12 15:55:49 2007
>***************
>*** 410,424 ****
>    ok = gFalse;
>  
>    nVals = width * nComps;
>-   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
>-       nComps >= INT_MAX / nBits ||
>-       width >= INT_MAX / nComps / nBits ||
>-       nVals * nBits + 7 < 0) {
>-     return;
>-   }
>    pixBytes = (nComps * nBits + 7) >> 3;
>    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
>!   if (rowBytes <= 0) {
>      return;
>    }
>    predLine = (Guchar *)gmalloc(rowBytes);
>--- 410,423 ----
>    ok = gFalse;
>  
>    nVals = width * nComps;
>    pixBytes = (nComps * nBits + 7) >> 3;
>    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
>!   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
>!       nComps > gfxColorMaxComps ||
>!       nBits > 16 ||
>!       nVals <= 0 ||
>!       nVals * nBits + 7 <= 0 ||
>!       rowBytes <= 0) {
>      return;
>    }
>    predLine = (Guchar *)gmalloc(rowBytes);

Actions: View | Diff

Attachments on bug 248194: 159239