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-bg,v 1.1 2004/12/18 00:39:31 tron Exp $

--- lib/Xm/Xpmhashtab.c.orig	2000-04-28 16:05:22.000000000 +0100
+++ lib/Xm/Xpmhashtab.c	2004-12-17 23:21:35.000000000 +0000
@@@@ -136,7 +136,7 @@@@
     xpmHashTable *table;
 {
     xpmHashAtom *atomTable = table->atomTable;
-    int size = table->size;
+    unsigned int size = table->size;
     xpmHashAtom *t, *p;
     int i;
     int oldSize = size;
@@@@ -145,6 +145,8 @@@@
     HASH_TABLE_GROWS
 	table->size = size;
     table->limit = size / 3;
+    if (size >= SIZE_MAX / sizeof(*atomTable)) 
+	return (XpmNoMemory);
     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
     if (!atomTable)
 	return (XpmNoMemory);
@@@@ -205,6 +207,8 @@@@
     table->size = INITIAL_HASH_SIZE;
     table->limit = table->size / 3;
     table->used = 0;
+    if (table->size >= SIZE_MAX / sizeof(*atomTable))
+	return (XpmNoMemory);
     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
     if (!atomTable)
 	return (XpmNoMemory);
@


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