2006-02-28 Kristian Høgsberg <krh@redhat.com>
* goo/gmem.c: (gmalloc), (grealloc):
* poppler/JBIG2Stream.cc:
* poppler/Stream.cc:
* poppler/Stream.h:
* splash/SplashXPathScanner.cc:
More integer overflow fixes from Derek Noonburg (#5922).
diff --git a/ChangeLog b/ChangeLog
index 48cf8d1..fa34d0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2006-02-28 Kristian Høgsberg <krh@redhat.com>
+ * goo/gmem.c: (gmalloc), (grealloc):
+ * poppler/JBIG2Stream.cc:
+ * poppler/Stream.cc:
+ * poppler/Stream.h:
+ * splash/SplashXPathScanner.cc:
+
+ More integer overflow fixes from Derek Noonburg (#5922).
+
+2006-02-28 Kristian Høgsberg <krh@redhat.com>
+
* poppler/PSOutputDev.cc: Make PSOutputDev constructor respect
passed in paper size (#5946, #5749).
diff --git a/goo/gmem.c b/goo/gmem.c
index a9bba7e..6a7de57 100644
--- a/goo/gmem.c
+++ b/goo/gmem.c
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
+#include <limits.h>
#include "gmem.h"
#ifdef DEBUG_MEM
@@ -63,7 +64,7 @@
int lst;
unsigned long *trl, *p;
- if (size == 0)
+ if (size <= 0)
return NULL;
size1 = gMemDataSize(size);
if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
@@ -86,7 +87,7 @@
#else
void *p;
- if (size == 0)
+ if (size <= 0)
return NULL;
if (!(p = malloc(size))) {
fprintf(stderr, "Out of memory\n");
@@ -102,7 +103,7 @@
void *q;
size_t oldSize;
- if (size == 0) {
+ if (size <= 0) {
if (p)
gfree(p);
return NULL;
@@ -120,7 +121,7 @@
#else
void *q;
- if (size == 0) {
+ if (size <= 0) {
if (p)
free(p);
return NULL;
diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index 337f5cc..05b1ab2 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -683,7 +683,7 @@
h = hA;
line = (wA + 7) >> 3;
- if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
error(-1, "invalid width/height");
data = NULL;
return;
@@ -700,7 +700,7 @@
h = bitmap->h;
line = bitmap->line;
- if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
error(-1, "invalid width/height");
data = NULL;
return;
@@ -2310,6 +2310,14 @@
!readUWord(&stepX) || !readUWord(&stepY)) {
goto eofError;
}
+ if (w == 0 || h == 0 || w >= INT_MAX / h) {
+ error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
+ return;
+ }
+ if (gridH == 0 || gridW >= INT_MAX / gridH) {
+ error(getPos(), "Bad grid size in JBIG2 halftone segment");
+ return;
+ }
// get pattern dictionary
if (nRefSegs != 1) {
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index ff27ca7..cd017a5 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -421,6 +421,12 @@
predLine = NULL;
ok = gFalse;
+ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+ nComps >= INT_MAX/nBits ||
+ width >= INT_MAX/nComps/nBits ||
+ nVals * nBits + 7 < 0) {
+ return;
+ }
nVals = width * nComps;
totalBits = nVals * nBits;
if (totalBits == 0 ||
@@ -3082,6 +3088,7 @@
numACHuffTables = index+1;
tbl = &acHuffTables[index];
} else {
+ index &= 0x0f;
if (index >= numDCHuffTables)
numDCHuffTables = index+1;
tbl = &dcHuffTables[index];
diff --git a/poppler/Stream.h b/poppler/Stream.h
index d8a546b..2b8dfd2 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -528,7 +528,7 @@
short getWhiteCode();
short getBlackCode();
short lookBits(int n);
- void eatBits(int n) { inputBits -= n; }
+ void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
};
#ifndef ENABLE_LIBJPEG
