summaryrefslogtreecommitdiff
path: root/xpdf
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2010-10-20 18:19:48 +0200
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2010-10-20 18:19:48 +0200
commit5917d299bfea212c050bfbb5bc280b6d5af79e27 (patch)
tree00707ecf434f71002bf4d9eba3aec2ae1b30836a /xpdf
parente1e4bf8ec5feee9e702d0b82f462ec809d19e812 (diff)
pdfextfix04: #b6993503# fix uninitialized pointer, range check
Diffstat (limited to 'xpdf')
-rw-r--r--xpdf/makefile.mk2
-rw-r--r--xpdf/xpdf-3.02-sec.patch29
2 files changed, 30 insertions, 1 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index c3dea0f006d5..452ab84fd0e4 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -48,7 +48,7 @@ dummy:
TARFILE_NAME=xpdf-3.02
TARFILE_MD5=599dc4cc65a07ee868cf92a667a913d2
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-sec.patch
CONFIGURE_DIR=
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/xpdf/xpdf-3.02-sec.patch b/xpdf/xpdf-3.02-sec.patch
new file mode 100644
index 000000000000..a33b85e8ab17
--- /dev/null
+++ b/xpdf/xpdf-3.02-sec.patch
@@ -0,0 +1,29 @@
+--- misc/xpdf-3.02/fofi/FoFiType1.cc 2007-02-27 23:05:51.000000000 +0100
++++ misc/build/xpdf-3.02/fofi/FoFiType1.cc 2010-10-20 18:10:09.000000000 +0200
+@@ -224,7 +224,7 @@
+ code = code * 8 + (*p2 - '0');
+ }
+ }
+- if (code < 256) {
++ if (code < 256 && code >= 0) {
+ for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
+ if (*p == '/') {
+ ++p;
+--- misc/xpdf-3.02/xpdf/Gfx.cc 2007-02-27 23:05:52.000000000 +0100
++++ misc/build/xpdf-3.02/xpdf/Gfx.cc 2010-10-20 18:14:32.000000000 +0200
+@@ -444,6 +444,7 @@
+ xref = xrefA;
+ subPage = gFalse;
+ printCommands = globalParams->getPrintCommands();
++ parser = NULL;
+
+ // start the resource stack
+ res = new GfxResources(xref, resDict, NULL);
+@@ -486,6 +487,7 @@
+ xref = xrefA;
+ subPage = gTrue;
+ printCommands = globalParams->getPrintCommands();
++ parser = NULL;
+
+ // start the resource stack
+ res = new GfxResources(xref, resDict, NULL);