Attachment 4247 Details for Bug 5516 – real patch

[patch] real patch

003-CVE-2005-3624_5_7.patch (text/plain), 4.51 KB, created by Martin Pitt on 2006-01-05 23:51:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Pitt

Created: 2006-01-05 23:51:11 UTC

Size: 4.51 KB

patch

obsolete

>diff -Nur poppler-0.4.3/poppler/JBIG2Stream.cc poppler-0.4.3.new/poppler/JBIG2Stream.cc
>--- poppler-0.4.3/poppler/JBIG2Stream.cc	2005-03-03 20:46:03.000000000 +0100
>+++ poppler-0.4.3.new/poppler/JBIG2Stream.cc	2006-01-05 13:32:20.000000000 +0100
>@@ -13,6 +13,7 @@
> #endif
> 
> #include <stdlib.h>
>+#include <limits.h>
> #include "goo/GooList.h"
> #include "Error.h"
> #include "JArithmeticDecoder.h"
>@@ -681,7 +682,16 @@
>   w = wA;
>   h = hA;
>   line = (wA + 7) >> 3;
>-  data = (Guchar *)gmalloc(h * line);
>+
>+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
>+    error(-1, "invalid width/height");
>+    data = NULL;
>+    return;
>+  }
>+
>+  // need to allocate one extra guard byte for use in combine()
>+  data = (Guchar *)gmalloc(h * line + 1);
>+  data[h * line] = 0;
> }
> 
> JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
>@@ -690,8 +700,17 @@
>   w = bitmap->w;
>   h = bitmap->h;
>   line = bitmap->line;
>-  data = (Guchar *)gmalloc(h * line);
>+
>+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
>+    error(-1, "invalid width/height");
>+    data = NULL;
>+    return;
>+  }
>+
>+  // need to allocate one extra guard byte for use in combine()
>+  data = (Guchar *)gmalloc(h * line + 1);
>   memcpy(data, bitmap->data, h * line);
>+  data[h * line] = 0;
> }
> 
> JBIG2Bitmap::~JBIG2Bitmap() {
>@@ -716,10 +735,14 @@
> }
> 
> void JBIG2Bitmap::expand(int newH, Guint pixel) {
>-  if (newH <= h) {
>+  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
>+    error(-1, "invalid width/height");
>+    gfree(data);
>+    data = NULL;
>     return;
>   }
>-  data = (Guchar *)grealloc(data, newH * line);
>+  // need to allocate one extra guard byte for use in combine()
>+  data = (Guchar *)grealloc(data, newH * line + 1);
>   if (pixel) {
>     memset(data + h * line, 0xff, (newH - h) * line);
>   } else {
>@@ -2256,6 +2279,15 @@
>     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
>     return;
>   }
>+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
>+    error(getPos(), "Bad size in JBIG2 halftone segment");
>+    return;
>+  }
>+  if (w == 0 || h >= INT_MAX / w) {
>+     error(getPos(), "Bad size in JBIG2 bitmap segment");
>+    return;
>+  }
>+
>   patternDict = (JBIG2PatternDict *)seg;
>   bpp = 0;
>   i = 1;
>@@ -2887,6 +2919,11 @@
>   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
>   int x, y, pix;
> 
>+  if (w < 0 || h <= 0 || w >= INT_MAX / h) {
>+    error(-1, "invalid width/height");
>+    return NULL;
>+  }
>+
>   bitmap = new JBIG2Bitmap(0, w, h);
>   bitmap->clearToZero();
> 
>diff -Nur poppler-0.4.3/poppler/Stream.cc poppler-0.4.3.new/poppler/Stream.cc
>--- poppler-0.4.3/poppler/Stream.cc	2005-12-12 21:41:14.000000000 +0100
>+++ poppler-0.4.3.new/poppler/Stream.cc	2006-01-05 13:31:52.000000000 +0100
>@@ -1288,6 +1288,10 @@
>   endOfLine = endOfLineA;
>   byteAlign = byteAlignA;
>   columns = columnsA;
>+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
>+    error(-1, "invalid number of columns: %d", columns);
>+    exit(1);
>+  }
>   rows = rowsA;
>   endOfBlock = endOfBlockA;
>   black = blackA;
>@@ -2928,7 +2932,8 @@
>   width = read16();
>   numComps = str->getChar();
>   if (numComps <= 0 || numComps > 4) {
>-    error(getPos(), "Bad number of components in DCT stream", prec);
>+    numComps = 0;
>+    error(getPos(), "Bad number of components in DCT stream");
>     return gFalse;
>   }
>   if (prec != 8) {
>@@ -2958,7 +2963,8 @@
>   width = read16();
>   numComps = str->getChar();
>   if (numComps <= 0 || numComps > 4) {
>-    error(getPos(), "Bad number of components in DCT stream", prec);
>+    numComps = 0;
>+    error(getPos(), "Bad number of components in DCT stream");
>     return gFalse;
>   }
>   if (prec != 8) {
>@@ -2984,6 +2990,7 @@
>   length = read16() - 2;
>   scanInfo.numComps = str->getChar();
>   if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
>+    scanInfo.numComps = 0;
>     error(getPos(), "Bad number of components in DCT stream");
>     return gFalse;
>   }
>@@ -3061,12 +3068,12 @@
>   while (length > 0) {
>     index = str->getChar();
>     --length;
>-    if ((index & 0x0f) >= 4) {
>+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
>       error(getPos(), "Bad DCT Huffman table");
>       return gFalse;
>     }
>     if (index & 0x10) {
>-      index &= 0x0f;
>+      index &= 0x03;
>       if (index >= numACHuffTables)
> 	numACHuffTables = index+1;
>       tbl = &acHuffTables[index];
>@@ -3184,9 +3191,11 @@
>   do {
>     do {
>       c = str->getChar();
>+      if(c == EOF) return EOF;
>     } while (c != 0xff);
>     do {
>       c = str->getChar();
>+      if(c == EOF) return EOF;
>     } while (c == 0xff);
>   } while (c == 0x00);
>   return c;

Actions: View | Splinter Review

Attachments on bug 5516: 4246 | 4247

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.