head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.16
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.14
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.12
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.10
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.8
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.6
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.4
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.2
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.1.0.32
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.30
	pkgsrc-2008Q1:1.1.0.28
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.26
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.24
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.22
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.20
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.18
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.16
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.14
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.12
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.10
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.8
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.6
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.4
	pkgsrc-2005Q1-base:1.1
	pkgsrc-2004Q4:1.1.0.2
	pkgsrc-2004Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2008.07.14.23.01.32;	author christos;	state dead;
branches;
next	1.1;

1.1
date	2004.12.18.00.39.31;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to openmotif 2.3.1
@
text
@$NetBSD: patch-ba,v 1.1 2004/12/18 00:39:31 tron Exp $

--- lib/Xm/XpmAttrib.c.orig	2000-04-28 16:05:22.000000000 +0100
+++ lib/Xm/XpmAttrib.c	2004-12-17 23:20:38.000000000 +0000
@@@@ -36,7 +36,7 @@@@
 #include "XpmI.h"
 
 /* 3.2 backward compatibility code */
-LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
 				 XpmColor ***oldct));
 
 LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
@@@@ -47,12 +47,15 @@@@
 static int
 CreateOldColorTable(ct, ncolors, oldct)
     XpmColor *ct;
-    int ncolors;
+    unsigned int ncolors;
     XpmColor ***oldct;
 {
     XpmColor **colorTable, **color;
     int a;
 
+    if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) 
+	return XpmNoMemory;
+
     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
     if (!colorTable) {
 	*oldct = NULL;
@


1.1
log
@Fix vulnerabilities reported in CAN-2004-0687 and CAN-2004-0688 by
applying a patch based on ICS's patch for OpenMotif 2.2.3.
@
text
@d1 1
a1 1
$NetBSD$
@