Update to poppler-0.12.1.
Contains the xpdf-3.02pl4 diffs and some additional bug fixes.
comments? ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 15 Oct 2009 20:43:40 -0000 1.28
+++ Makefile 25 Oct 2009 14:24:29 -0000
@@ -4,10 +4,10 @@ COMMENT-main= PDF rendering library
COMMENT-qt= qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library
-V= 0.12.0
+V= 0.12.1
DISTNAME= poppler-$V
CATEGORIES= print
-PKGNAME-main= poppler-$Vp0
+PKGNAME-main= poppler-$V
FULLPKGNAME-qt= poppler-qt-$V
FULLPKGNAME-qt4=poppler-qt4-$V
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 13 Oct 2009 10:19:37 -0000 1.8
+++ distinfo 25 Oct 2009 14:24:29 -0000
@@ -1,5 +1,5 @@
-MD5 (poppler-0.12.0.tar.gz) = OZsl2dca0ivJoqkoF2nEnA==
-RMD160 (poppler-0.12.0.tar.gz) = yQpqQ3+3teXJyc2vcngr4WzYrgc=
-SHA1 (poppler-0.12.0.tar.gz) = YWXPxGNAZE6HUKuKN/Oj1jQUQQY=
-SHA256 (poppler-0.12.0.tar.gz) = qV1KYbEiD2C8QKkhdm8C1tGOgna3ApFyPWz3epxzaa4=
-SIZE (poppler-0.12.0.tar.gz) = 1595424
+MD5 (poppler-0.12.1.tar.gz) = NDIEbuER76W4Xl8s3eivXA==
+RMD160 (poppler-0.12.1.tar.gz) = kuoEO4syniPRMGivXP7Y/Ufupeg=
+SHA1 (poppler-0.12.1.tar.gz) = DIUU94nqq06RuhqEH1j4vuleSkM=
+SHA256 (poppler-0.12.1.tar.gz) = YxajYY79QR40pIoQKhlJsf3MVi9uacTSjwZpkTRRu7Y=
+SIZE (poppler-0.12.1.tar.gz) = 1641986
Index: patches/patch-poppler_Stream_cc
===================================================================
RCS file: patches/patch-poppler_Stream_cc
diff -N patches/patch-poppler_Stream_cc
--- patches/patch-poppler_Stream_cc 15 Oct 2009 20:43:40 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-poppler_Stream_cc,v 1.3 2009/10/15 20:43:40 kili Exp $
---- poppler/Stream.cc.orig Wed Sep 2 20:48:16 2009
-+++ poppler/Stream.cc Thu Oct 15 20:18:53 2009
-@@ -404,6 +404,10 @@ ImageStream::ImageStream(Stream *strA, int widthA, int
- } else {
- imgLineSize = nVals;
- }
-+ if (width > INT_MAX / nComps) {
-+ // force a call to gmallocn(-1,...), which will throw an exception
-+ imgLineSize = -1;
-+ }
- imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
- imgIdx = nVals;
- }
Index: patches/patch-poppler_XRef_cc
===================================================================
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 15 Oct 2009 20:43:40 -0000 1.3
+++ patches/patch-poppler_XRef_cc 25 Oct 2009 14:24:29 -0000
@@ -1,58 +1,7 @@
-$OpenBSD: patch-poppler_XRef_cc,v 1.3 2009/10/15 20:43:40 kili Exp $
---- poppler/XRef.cc.orig Wed Sep 2 20:48:16 2009
-+++ poppler/XRef.cc Thu Oct 15 20:32:12 2009
-@@ -76,6 +76,8 @@ class ObjectStream { (public)
- // generation 0.
- ObjectStream(XRef *xref, int objStrNumA);
-
-+ GBool isOk() { return ok; }
-+
- ~ObjectStream();
-
- // Return the object number of this object stream.
-@@ -91,6 +93,7 @@ class ObjectStream { (public)
- int nObjects; // number of objects in the stream
- Object *objs; // the objects (length = nObjects)
- int *objNums; // the object numbers (length =
nObjects)
-+ GBool ok;
- };
-
- ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
-@@ -104,6 +107,7 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA)
- nObjects = 0;
- objs = NULL;
- objNums = NULL;
-+ ok = gFalse;
-
- if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
- goto err1;
-@@ -134,6 +138,13 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA)
- goto err1;
- }
-
-+ // this is an arbitrary limit to avoid integer overflow problems
-+ // in the 'new Object[nObjects]' call (Acrobat apparently limits
-+ // object streams to 100-200 objects)
-+ if (nObjects > 1000000) {
-+ error(-1, "Too many objects in an object stream");
-+ goto err1;
-+ }
- objs = new Object[nObjects];
- objNums = (int *)gmallocn(nObjects, sizeof(int));
- offsets = (int *)gmallocn(nObjects, sizeof(int));
-@@ -190,10 +201,10 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA)
- }
-
- gfree(offsets);
-+ ok = gTrue;
-
- err1:
- objStr.free();
-- return;
- }
-
- ObjectStream::~ObjectStream() {
-@@ -850,45 +861,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
+$OpenBSD: patch-poppler_XRef_cc,v 1.2 2008/10/28 12:59:55 kili Exp $
+--- poppler/XRef.cc.orig Sun Sep 14 22:35:48 2008
++++ poppler/XRef.cc Sun Oct 26 12:45:54 2008
+@@ -850,45 +850,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {
@@ -106,15 +55,3 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.3 20
}
Object *XRef::fetch(int num, int gen, Object *obj) {
-@@ -970,6 +974,11 @@ Object *XRef::fetch(int num, int gen, Object *obj) {
- delete objStr;
- }
- objStr = new ObjectStream(this, e->offset);
-+ if (!objStr->isOk()) {
-+ delete objStr;
-+ objStr = NULL;
-+ goto err;
-+ }
- }
- objStr->getObject(e->gen, num, obj);
- break;
Index: patches/patch-splash_SplashBitmap_cc
===================================================================
RCS file: patches/patch-splash_SplashBitmap_cc
diff -N patches/patch-splash_SplashBitmap_cc
--- patches/patch-splash_SplashBitmap_cc 15 Oct 2009 20:43:40 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-$OpenBSD: patch-splash_SplashBitmap_cc,v 1.1 2009/10/15 20:43:40 kili Exp $
---- splash/SplashBitmap.cc.orig Wed Sep 2 20:48:16 2009
-+++ splash/SplashBitmap.cc Thu Oct 15 20:29:09 2009
-@@ -28,6 +28,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <limits.h>
- #include "goo/gmem.h"
- #include "SplashErrorCodes.h"
- #include "SplashBitmap.h"
-@@ -46,26 +47,44 @@ SplashBitmap::SplashBitmap(int widthA, int heightA, in
- mode = modeA;
- switch (mode) {
- case splashModeMono1:
-- rowSize = (width + 7) >> 3;
-+ if (width > 0) {
-+ rowSize = (width + 7) >> 3;
-+ } else {
-+ rowSize = -1;
-+ }
- break;
- case splashModeMono8:
-- rowSize = width;
-+ if (width > 0) {
-+ rowSize = width;
-+ } else {
-+ rowSize = -1;
-+ }
- break;
- case splashModeRGB8:
- case splashModeBGR8:
-- rowSize = width * 3;
-+ if (width > 0 && width <= INT_MAX / 3) {
-+ rowSize = width * 3;
-+ } else {
-+ rowSize = -1;
-+ }
- break;
- case splashModeXBGR8:
- rowSize = width * 4;
- break;
- #if SPLASH_CMYK
- case splashModeCMYK8:
-- rowSize = width * 4;
-+ if (width > 0 && width <= INT_MAX / 4) {
-+ rowSize = width * 4;
-+ } else {
-+ rowSize = -1;
-+ }
- break;
- #endif
- }
-- rowSize += rowPad - 1;
-- rowSize -= rowSize % rowPad;
-+ if (rowSize > 0) {
-+ rowSize += rowPad - 1;
-+ rowSize -= rowSize % rowPad;
-+ }
- data = (SplashColorPtr)gmallocn(rowSize, height);
- if (!topDown) {
- data += (height - 1) * rowSize;
Index: patches/patch-splash_SplashErrorCodes_h
===================================================================
RCS file: patches/patch-splash_SplashErrorCodes_h
diff -N patches/patch-splash_SplashErrorCodes_h
--- patches/patch-splash_SplashErrorCodes_h 15 Oct 2009 20:43:40 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-$OpenBSD: patch-splash_SplashErrorCodes_h,v 1.1 2009/10/15 20:43:40 kili Exp $
---- splash/SplashErrorCodes.h.orig Wed Sep 2 20:48:16 2009
-+++ splash/SplashErrorCodes.h Thu Oct 15 20:24:43 2009
-@@ -45,4 +45,6 @@
-
- #define splashErrGeneric 255
-
-+#define splashErrBadArg 9 // bad argument
-+
- #endif
Index: patches/patch-splash_Splash_cc
===================================================================
RCS file: patches/patch-splash_Splash_cc
diff -N patches/patch-splash_Splash_cc
--- patches/patch-splash_Splash_cc 15 Oct 2009 20:43:40 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-splash_Splash_cc,v 1.3 2009/10/15 20:43:40 kili Exp $
---- splash/Splash.cc.orig Wed Sep 2 20:48:16 2009
-+++ splash/Splash.cc Thu Oct 15 20:24:10 2009
-@@ -27,6 +27,7 @@
-
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
- #include "goo/gmem.h"
- #include "SplashErrorCodes.h"
- #include "SplashMath.h"
-@@ -2001,6 +2002,9 @@ SplashError Splash::fillImageMask(SplashImageMaskSourc
- xq = w % scaledWidth;
-
- // allocate pixel buffer
-+ if (yp < 0 || yp > INT_MAX - 1) {
-+ return splashErrBadArg;
-+ }
- pixBuf = (SplashColorPtr)gmallocn((yp + 1), w);
-
- // initialize the pixel pipe
-@@ -2301,6 +2305,9 @@ SplashError Splash::drawImage(SplashImageSource src, v
- xq = w % scaledWidth;
-
- // allocate pixel buffers
-+ if (yp < 0 || yp > INT_MAX - 1 || w > INT_MAX / nComps) {
-+ return splashErrBadArg;
-+ }
- colorBuf = (SplashColorPtr)gmallocn3((yp + 1), w, nComps);
- if (srcAlpha) {
- alphaBuf = (Guchar *)gmallocn((yp + 1), w);
