head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.32 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.30 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.28 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.26 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.24 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.22 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.20 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.18 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.16 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.14 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.12 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.10 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.8 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.6 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.4 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.2 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.3.0.12 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.10 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.8 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.6 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.4 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.4 date 2006.08.10.03.45.32; author minskim; state dead; branches; next 1.3; 1.3 date 2005.01.16.08.35.08; author kei; state Exp; branches; next 1.2; 1.2 date 2003.12.24.12.51.31; author jmmv; state dead; branches; next 1.1; 1.1 date 99.10.04.23.21.45; author simonb; state Exp; branches; next ; desc @@ 1.4 log @Remove teTeX2. @ text @$NetBSD: patch-ai,v 1.3 2005/01/16 08:35:08 kei Exp $ --- libs/xpdf/xpdf/GfxState.cc.orig 2005-01-04 16:27:49.000000000 +0900 +++ libs/xpdf/xpdf/GfxState.cc 2005-01-04 16:30:39.000000000 +0900 @@@@ -708,6 +708,11 @@@@ } nCompsA = obj2.getInt(); obj2.free(); + if (nCompsA > gfxColorMaxComps) { + error(-1, "ICCBased color space with too many (%d > %d) components", + nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } if (dict->lookup("Alternate", &obj2)->isNull() || !(altA = GfxColorSpace::parse(&obj2))) { switch (nCompsA) { @ 1.3 log @applied patches pulled from xpdf-3.00pl2.patch. this should fix security problems described in CAN-2004-0888. pointed out by Thomas Klausner. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update teTeX packages to 2.0.2 (really merge teTeX2 into teTeX). The 2.x branch becomes the default teTeX package. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.1 1999/10/04 23:21:45 simonb Exp $ d3 14 a16 90 --- texk/ps2pkm/objects.c.orig Tue Feb 24 22:54:33 1998 +++ texk/ps2pkm/objects.c Thu Sep 30 13:34:16 1999 @@@@ -300,14 +300,14 @@@@ size = (size + sizeof(LONG) - 1) & -sizeof(LONG); extra = (extra + sizeof(LONG) - 1) & -sizeof(LONG); if (size + extra <= 0) - abort("Non-positive allocate?"); + t1_abort("Non-positive allocate?"); r = (struct xobject *) Xalloc(size + extra); while (r == NULL) { if (!GimeSpace()) { IfTrace1(TRUE, "malloc attempted %d bytes.\n", size + extra); - abort("We have REALLY run out of memory"); + t1_abort("We have REALLY run out of memory"); } r = (struct xobject *) Xalloc(size + extra); } @@@@ -358,7 +358,7 @@@@ register struct xobject *obj; /* structure to free */ { if (obj->type == INVALIDTYPE) - abort("Free of already freed object?"); + t1_abort("Free of already freed object?"); obj->type = INVALIDTYPE; if (MemoryDebug > 1) { @@@@ -777,7 +777,7 @@@@ char name[NAMESIZE]; /* buffer to store my copy of 'username' */ if (strlen(username) >= NAMESIZE) - abort("Pragmatics name too large"); + t1_abort("Pragmatics name too large"); strcpy(name, username); for (p = name; *p != '\0'; p++) *p = toupper(*p); @@@@ -941,7 +941,7 @@@@ return; default: - abort("Consume: too many objects"); + t1_abort("Consume: too many objects"); } } #endif /* WIN32 */ @@@@ -967,7 +967,7 @@@@ ObjectPostMortem(obj); if (MustCrash) - abort("Terminating because of CrashOnUserError..."); + t1_abort("Terminating because of CrashOnUserError..."); else ErrorMessage = typemsg; @@@@ -1062,14 +1062,14 @@@@ if (obj != NULL) ObjectPostMortem(obj); if (MustCrash) - abort("Terminating because of CrashOnUserError..."); + t1_abort("Terminating because of CrashOnUserError..."); else ErrorMessage = str; return(ret); } /* -:h3.abort() - Crash Due to Error +:h3.t1_abort() - Crash Due to Error We divide by zero, and if that doesn't work, call exit(), the results of which is system dependent (and thus is part of the Hourglass required @@@@ -1078,7 +1078,7 @@@@ static int test = 0; /*ARGSUSED*/ -void abort(str) +void t1_abort(str) char *str; { LineIOTrace = TRUE; @@@@ -1120,7 +1120,7 @@@@ /* All other calls to malloc are defined to Xalloc. */ if (sizeof(SHORT) != 2 || sizeof(LONG) != 4) - abort("Fundamental TYPE1IMAGER assumptions invalid in this port"); + t1_abort("Fundamental TYPE1IMAGER assumptions invalid in this port"); InitSpaces(); InitFonts(); InitFiles(); @ 1.1 log @Don't use a function called "abort" that takes one char * as a parameter. Fixes compile problems on at least pmax, arm32. @ text @d1 1 a1 1 $NetBSD$ @