head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.8 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.6 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.4 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.5.0.14 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.12 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.10 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.8 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.6 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.4 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.2 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.0.12 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.10 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.8 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.6 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.4 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.2; locks; strict; comment @# @; 1.8 date 2011.01.31.16.55.29; author drochner; state dead; branches; next 1.7; 1.7 date 2011.01.24.13.11.20; author wiz; state Exp; branches; next 1.6; 1.6 date 2011.01.13.17.01.35; author wiz; state Exp; branches; next 1.5; 1.5 date 2007.11.28.20.54.38; author drochner; state dead; branches; next 1.4; 1.4 date 2007.11.08.12.06.12; author drochner; state Exp; branches; next 1.3; 1.3 date 2007.11.03.16.10.39; author drochner; state dead; branches; next 1.2; 1.2 date 2007.01.17.15.53.09; author drochner; state Exp; branches; next 1.1; 1.1 date 2005.12.15.01.00.51; author seb; state dead; branches 1.1.2.1; next ; 1.1.2.1 date 2005.12.15.01.00.51; author seb; state Exp; branches; next ; desc @@ 1.8 log @update to 0.16.2 This switches to a new major branch -- many improvements and fixes. @ text @$NetBSD: patch-ad,v 1.7 2011/01/24 13:11:20 wiz Exp $ Fix build with png-1.5. https://bugs.freedesktop.org/show_bug.cgi?id=33405 --- goo/PNGWriter.cc.orig 2010-06-08 20:06:31.000000000 +0000 +++ goo/PNGWriter.cc @@@@ -15,6 +15,7 @@@@ #include "PNGWriter.h" #ifdef ENABLE_LIBPNG +#include #include "poppler/Error.h" @ 1.7 log @Add comment and upstream bug report URL. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2011/01/13 17:01:35 wiz Exp $ @ 1.6 log @Fix build with png-1.5. @ text @d1 4 a4 1 $NetBSD$ @ 1.5 log @update to 0.6.2 changes: -security fixes (patched in pkgsrc) were integrated upstream -fix some possible crashes -cleanup @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4 2007/11/08 12:06:12 drochner Exp $ d3 9 a11 16 --- poppler/Stream.h.orig 2007-10-12 13:34:20.000000000 +0200 +++ poppler/Stream.h @@@@ -526,13 +526,15 @@@@ private: int row; // current row int inputBuf; // input buffer int inputBits; // number of bits in input buffer - short *refLine; // reference line changing elements - int b1; // index into refLine - short *codingLine; // coding line changing elements - int a0; // index into codingLine + int *codingLine; // coding line changing elements + int *refLine; // reference line changing elements + int a0i; // index into codingLine + GBool err; // error on current line int outputBits; // remaining ouput bits int buf; // character buffer a12 5 + void addPixels(int a1, int black); + void addPixelsNeg(int a1, int black); short getTwoDimCode(); short getWhiteCode(); short getBlackCode(); @ 1.4 log @apply a patch from poppler CVS (derived from xpdf) to fix a couple of memory corruption / buffer overflows (CVE-2007-4352, CVE-2007-5392, CVE-2007-5393) bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @update to 0.6.1 This switches to the new 0.6 branch which is not source compatible to 0.5.x. Most notable changes: -Merge xpdf 3.02 changes -Support for Sound objects -Support for Opening/Closing page actions -Support for page duration -Improve PS Tokenizer performance -Beginning of Interactive Form support -xpdfrc is no longer used for anything -Fix security issue MOAB-06-01-2007 -Lots of bugs fixed @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2007/01/17 15:53:09 drochner Exp $ d3 16 a18 5 --- poppler/Catalog.cc.orig 2006-09-13 17:10:52.000000000 +0200 +++ poppler/Catalog.cc @@@@ -26,6 +26,12 @@@@ #include "UGooString.h" #include "Catalog.h" d20 5 a24 44 +// This define is used to limit the depth of recursive readPageTree calls +// This is needed because the page tree nodes can reference their parents +// leaving us in an infinite loop +// Most sane pdf documents don't have a call depth higher than 10 +#define MAX_CALL_DEPTH 1000 + //------------------------------------------------------------------------ // Catalog //------------------------------------------------------------------------ @@@@ -75,7 +81,7 @@@@ Catalog::Catalog(XRef *xrefA) { pageRefs[i].num = -1; pageRefs[i].gen = -1; } - numPages = readPageTree(pagesDict.getDict(), NULL, 0); + numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); if (numPages != numPages0) { error(-1, "Page count in top-level pages object is incorrect"); } @@@@ -217,7 +223,7 @@@@ GooString *Catalog::readMetadata() { return s; } -int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { +int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { Object kids; Object kid; Object kidRef; @@@@ -262,9 +268,13 @@@@ int Catalog::readPageTree(Dict *pagesDic // This should really be isDict("Pages"), but I've seen at least one // PDF file where the /Type entry is missing. } else if (kid.isDict()) { - if ((start = readPageTree(kid.getDict(), attrs1, start)) - < 0) - goto err2; + if (callDepth > MAX_CALL_DEPTH) { + error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); + } else { + if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) + < 0) + goto err2; + } } else { error(-1, "Kid object (page %d) is wrong type (%s)", start+1, kid.getTypeName()); @ 1.2 log @pull a patch from poppler CVS to fix MOAB-06-01-2007 (DOS) bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @file patch-ad was initially added on branch pkgsrc-2005Q3. @ text @d1 52 @ 1.1.2.1 log @Pullup ticket 955 - requested by Lubomir Sedlacik security fix via patch for print/poppler Module Name: pkgsrc Committed By: salo Date: Sun Dec 11 05:08:50 UTC 2005 Modified Files: pkgsrc/print/poppler: Makefile distinfo Added Files: pkgsrc/print/poppler/patches: patch-aa patch-ab patch-ac Log Message: Security fixes for CVE-2005-3191, CVE-2005-3192 and CVE-2005-3193. Patches from xpdf. @ text @a0 23 $NetBSD$ Security fix for CVE-2005-3192. --- poppler/Stream.h.orig 2005-04-28 17:23:34.000000000 +0200 +++ poppler/Stream.h 2005-12-11 06:14:47.000000000 +0100 @@@@ -231,6 +231,8 @@@@ public: ~StreamPredictor(); + GBool isOk() { return ok; } + int lookChar(); int getChar(); @@@@ -248,6 +250,7 @@@@ private: int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine + GBool ok; }; //------------------------------------------------------------------------ @