upgrade to xpdf 2.02

--
From: naddy@
This commit is contained in:
brad 2003-05-20 00:37:10 +00:00
parent c41101bc5c
commit 2d8ff25d82
4 changed files with 10 additions and 33 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.32 2003/02/12 08:28:20 sturm Exp $
# $OpenBSD: Makefile,v 1.33 2003/05/20 00:37:10 brad Exp $
COMMENT= "PDF viewer for X"
DISTNAME= xpdf-2.01
DISTNAME= xpdf-2.02
CATEGORIES= textproc x11
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/

View File

@ -1,3 +1,3 @@
MD5 (xpdf-2.01.tar.gz) = 90326075b7bdabe85dc011882365824c
RMD160 (xpdf-2.01.tar.gz) = 96081eb4a5ffdc6c2ebc536c96a8f590c7e8436e
SHA1 (xpdf-2.01.tar.gz) = 9c5633b937496bad9ef14031713e6c45b68b066c
MD5 (xpdf-2.02.tar.gz) = fb54402d98fb834e5778163cfc238b44
RMD160 (xpdf-2.02.tar.gz) = 24136006e26916358ef93fdcda792f40335629ad
SHA1 (xpdf-2.02.tar.gz) = 482b6a33addc50fd1ec73f676b4db74a17d4dd75

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-xpdf_GfxState_cc,v 1.2 2003/02/12 08:28:20 sturm Exp $
--- xpdf/GfxState.cc.orig Fri Dec 6 00:44:32 2002
+++ xpdf/GfxState.cc Tue Feb 11 16:53:52 2003
@@ -815,9 +815,19 @@ GfxColorSpace *GfxIndexedColorSpace::par
obj1.free();
if (!arr->get(2, &obj1)->isInt()) {
error(-1, "Bad Indexed color space (hival)");
+ delete baseA;
goto err2;
}
indexHighA = obj1.getInt();
+ if (indexHighA < 0 || indexHighA > 255) {
+ // the PDF spec requires indexHigh to be in [0,255] -- allowing
+ // values larger than 255 creates a security hole: if nComps *
+ // indexHigh is greater than 2^31, the loop below may overwrite
+ // past the end of the array
+ error(-1, "Bad Indexed color space (invalid indexHigh value)");
+ delete baseA;
+ goto err2;
+ }
obj1.free();
cs = new GfxIndexedColorSpace(baseA, indexHighA);
arr->get(3, &obj1);

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-xpdf_Makefile_in,v 1.3 2003/02/12 08:28:20 sturm Exp $
--- xpdf/Makefile.in.orig Tue Feb 11 16:52:12 2003
+++ xpdf/Makefile.in Tue Feb 11 16:52:20 2003
$OpenBSD: patch-xpdf_Makefile_in,v 1.4 2003/05/20 00:37:10 brad Exp $
--- xpdf/Makefile.in.orig Sun May 18 21:29:29 2003
+++ xpdf/Makefile.in Sun May 18 21:29:43 2003
@@ -15,7 +15,7 @@ VPATH = @srcdir@
GOOSRCDIR = $(srcdir)/../goo
GOOLIBDIR = ../goo
-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir) @freetype_CFLAGS@ @freetype2_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
+CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir) @freetype_CFLAGS@ @freetype2_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir) @freetype_CFLAGS@ @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
+CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir) @freetype_CFLAGS@ @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
LDFLAGS = @LDFLAGS@