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
141
142
143
144
145
146
147
148
149
150
151
152
|
$NetBSD: patch-ap,v 1.3 2010/10/01 21:32:34 spz Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=25189
plus security fixes for http://secunia.com/advisories/41596/
taken from http://cgit.freedesktop.org/poppler/
- Make sure obj1 is a num before reading it
- Fix crash in broken pdf (parser->getStream() is 0)
- Properly initialize parser
- Give a value to color.c[i]
--- poppler/Gfx.cc.orig 2010-08-11 19:20:32.000000000 +0000
+++ poppler/Gfx.cc
@@ -536,6 +536,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, i
drawText = gFalse;
maskHaveCSPattern = gFalse;
mcStack = NULL;
+ parser = NULL;
// start the resource stack
res = new GfxResources(xref, resDict, NULL);
@@ -590,6 +591,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, D
drawText = gFalse;
maskHaveCSPattern = gFalse;
mcStack = NULL;
+ parser = NULL;
// start the resource stack
res = new GfxResources(xref, resDict, NULL);
@@ -1531,6 +1533,8 @@ void Gfx::opSetFillColorN(Object args[],
for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
if (args[i].isNum()) {
color.c[i] = dblToCol(args[i].getNum());
+ } else {
+ color.c[i] = 0; // TODO Investigate if this is what Adobe does
}
}
state->setFillColor(&color);
@@ -1550,6 +1554,8 @@ void Gfx::opSetFillColorN(Object args[],
for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) {
if (args[i].isNum()) {
color.c[i] = dblToCol(args[i].getNum());
+ } else {
+ color.c[i] = 0; // TODO Investigate if this is what Adobe does
}
}
state->setFillColor(&color);
@@ -1574,6 +1580,8 @@ void Gfx::opSetStrokeColorN(Object args[
for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
if (args[i].isNum()) {
color.c[i] = dblToCol(args[i].getNum());
+ } else {
+ color.c[i] = 0; // TODO Investigate if this is what Adobe does
}
}
state->setStrokeColor(&color);
@@ -1593,6 +1601,8 @@ void Gfx::opSetStrokeColorN(Object args[
for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) {
if (args[i].isNum()) {
color.c[i] = dblToCol(args[i].getNum());
+ } else {
+ color.c[i] = 0; // TODO Investigate if this is what Adobe does
}
}
state->setStrokeColor(&color);
@@ -2421,7 +2431,7 @@ static void bubbleSort(double array[])
void Gfx::doAxialShFill(GfxAxialShading *shading) {
double xMin, yMin, xMax, yMax;
double x0, y0, x1, y1;
- double dx, dy, mul;
+ double dx, dy, len2;
GBool dxZero, dyZero;
double bboxIntersections[4];
double tMin, tMax, tx, ty;
@@ -2443,16 +2453,18 @@ void Gfx::doAxialShFill(GfxAxialShading
shading->getCoords(&x0, &y0, &x1, &y1);
dx = x1 - x0;
dy = y1 - y0;
- dxZero = fabs(dx) < 0.01;
- dyZero = fabs(dy) < 0.01;
- if (dxZero && dyZero) {
- tMin = tMax = 0;
+ dxZero = (dx == 0.0);
+ dyZero = (dy == 0.0);
+ len2 = dx * dx + dy * dy;
+ if (len2 == 0.0) {
+ /* invalid? */
+ tMin = 0;
+ tMax = 1;
} else {
- mul = 1 / (dx * dx + dy * dy);
- bboxIntersections[0] = ((xMin - x0) * dx + (yMin - y0) * dy) * mul;
- bboxIntersections[1] = ((xMin - x0) * dx + (yMax - y0) * dy) * mul;
- bboxIntersections[2] = ((xMax - x0) * dx + (yMin - y0) * dy) * mul;
- bboxIntersections[3] = ((xMax - x0) * dx + (yMax - y0) * dy) * mul;
+ bboxIntersections[0] = ((xMin - x0) * dx + (yMin - y0) * dy) / len2;
+ bboxIntersections[1] = ((xMin - x0) * dx + (yMax - y0) * dy) / len2;
+ bboxIntersections[2] = ((xMax - x0) * dx + (yMin - y0) * dy) / len2;
+ bboxIntersections[3] = ((xMax - x0) * dx + (yMax - y0) * dy) / len2;
bubbleSort(bboxIntersections);
tMin = bboxIntersections[0];
tMax = bboxIntersections[3];
@@ -4225,8 +4237,14 @@ void Gfx::doForm(Object *str) {
}
for (i = 0; i < 4; ++i) {
bboxObj.arrayGet(i, &obj1);
- bbox[i] = obj1.getNum();
- obj1.free();
+ if (likely(obj1.isNum())) {
+ bbox[i] = obj1.getNum();
+ obj1.free();
+ } else {
+ obj1.free();
+ error(getPos(), "Bad form bounding box value");
+ return;
+ }
}
bboxObj.free();
@@ -4449,8 +4467,13 @@ Stream *Gfx::buildImageStream() {
obj.free();
// make stream
- str = new EmbedStream(parser->getStream(), &dict, gFalse, 0);
- str = str->addFilters(&dict);
+ if (parser->getStream()) {
+ str = new EmbedStream(parser->getStream(), &dict, gFalse, 0);
+ str = str->addFilters(&dict);
+ } else {
+ str = NULL;
+ dict.free();
+ }
return str;
}
@@ -4651,8 +4674,14 @@ void Gfx::drawAnnot(Object *str, AnnotBo
}
for (i = 0; i < 4; ++i) {
bboxObj.arrayGet(i, &obj1);
- bbox[i] = obj1.getNum();
- obj1.free();
+ if (likely(obj1.isNum())) {
+ bbox[i] = obj1.getNum();
+ obj1.free();
+ } else {
+ obj1.free();
+ error(getPos(), "Bad form bounding box value");
+ return;
+ }
}
bboxObj.free();
|
