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.17.12.19.13;	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-aj,v 1.3 2005/01/17 12:19:13 kei Exp $

--- libs/xpdf/xpdf/Catalog.cc.orig	Mon Nov  4 07:15:36 2002
+++ libs/xpdf/xpdf/Catalog.cc	Fri Oct 29 09:18:17 2004
@@@@ -22,6 +22,7 @@@@
 #include "Error.h"
 #include "Link.h"
 #include "Catalog.h"
+#include <limits.h>
 
 //------------------------------------------------------------------------
 // Catalog
@@@@ -63,6 +64,12 @@@@
   }
   pagesSize = numPages0 = obj.getInt();
   obj.free();
+  if ((pagesSize >= INT_MAX / sizeof(Page *)) ||
+      (pagesSize >= INT_MAX / sizeof(Ref))) {
+    error(-1, "Invalid 'pagesSize'");
+    ok = gFalse;
+    return;
+  }
   pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
   pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
   for (i = 0; i < pagesSize; ++i) {
@@@@ -190,6 +197,11 @@@@
       }
       if (start >= pagesSize) {
 	pagesSize += 32;
+	if ((pagesSize >= INT_MAX/sizeof(Page *)) ||
+	    (pagesSize >= INT_MAX/sizeof(Ref))) {
+	  error(-1, "Invalid 'pagesSize' parameter.");
+	  goto err3;
+	}
 	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
 	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
 	for (j = pagesSize - 32; j < pagesSize; ++j) {
@


1.3
log
@fixed CAN-2004-0888.  Since xpdf included with teTeX is 2.01, so this
back-ported fix is pulled from FreeBSD ports collection.  Hiroki Sato
noticed and helped me a lot.
@
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-aj,v 1.1 1999/10/04 23:21:45 simonb Exp $
d3 35
a37 10
--- texk/ps2pkm/objects.h.orig	Tue Mar 16 18:16:08 1999
+++ texk/ps2pkm/objects.h	Thu Sep 30 13:35:40 1999
@@@@ -61,7 +61,6 @@@@
 /*END SHARED*/
 /*SHARED*/
  
-#define   abort(line)       t1_abort(line)
 #define   Allocate(n,t,s)   t1_Allocate(n,t,s)
 #define   Free(obj)         t1_Free(obj)
 #define   NonObjectFree(a)  Xfree(a)
@


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$
@