1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
--- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.old 2006-01-22 16:55:56.000000000 +0100
+++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc 2006-01-22 16:56:09.000000000 +0100
@@ -7,6 +7,7 @@
//========================================================================
#include <aconf.h>
+#include <limits.h>
#ifdef USE_GCC_PRAGMAS
#pragma implementation
--- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.old 2006-01-22 16:57:41.000000000 +0100
+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc 2006-01-22 17:08:11.000000000 +0100
@@ -7,6 +7,7 @@
//========================================================================
#include <aconf.h>
+#include <limits.h>
#ifdef USE_GCC_PRAGMAS
#pragma implementation
@@ -1275,8 +1276,9 @@
endOfLine = endOfLineA;
byteAlign = byteAlignA;
columns = columnsA;
- if (columns < 1) {
- columns = 1;
+ if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
+ error (-1, "invalid number of columns: %d\n", columns);
+ exit (1);
}
rows = rowsA;
endOfBlock = endOfBlockA;
@@ -2952,6 +2954,10 @@
height = read16();
width = read16();
numComps = str->getChar();
+ if (numComps <= 0 || numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream", prec);
+ return gFalse;
+ }
if (prec != 8) {
error(getPos(), "Bad DCT precision %d", prec);
return gFalse;
@@ -2974,6 +2979,11 @@
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;
+ }
--length;
if (length != 2 * scanInfo.numComps + 3) {
error(getPos(), "Bad DCT scan info block");
@@ -3058,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];
@@ -3181,9 +3191,11 @@
do {
do {
c = str->getChar();
+ if (c == EOF) return EOF;
} while (c != 0xff && c != EOF);
do {
c = str->getChar();
+ if (c == EOF) return EOF;
} while (c == 0xff);
} while (c == 0x00);
return c;
--- tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc.old 2006-01-22 17:08:49.000000000 +0100
+++ tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc 2006-01-22 17:15:41.000000000 +0100
@@ -7,6 +7,7 @@
//========================================================================
#include <aconf.h>
+#include <limits.h>
#ifdef USE_GCC_PRAGMAS
#pragma implementation
@@ -681,6 +682,11 @@
w = wA;
h = hA;
line = (wA + 7) >> 3;
+ 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;
@@ -692,6 +698,11 @@
w = bitmap->w;
h = bitmap->h;
line = bitmap->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);
@@ -720,7 +731,10 @@
}
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;
}
// need to allocate one extra guard byte for use in combine()
@@ -2936,6 +2950,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();
|
GitWeb