Pullup ticket 351 - requested by Lubomir Sedlacik

security fix for openmotif

Revisions pulled up:
- pkgsrc/x11/openmotif/Makefile		1.32
- pkgsrc/x11/openmotif/distinfo		1.16
- pkgsrc/x11/openmotif/patches/patch-bi	1.2


    Module Name:    pkgsrc
    Committed By:   wiz
    Date:           Thu Mar 10 16:00:32 UTC 2005

    Modified Files:
            pkgsrc/x11/openmotif: Makefile distinfo
            pkgsrc/x11/openmotif/patches: patch-bi

    Log Message:
    Add patch to fix CAN-2005-0605. Bump PKGREVISION.

3 files changed, 23 insertions, 13 deletions

diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index b0cde1ebc44..2472db20079 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/12/18 00:39:31 tron Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2005/03/11 06:45:03 snj Exp $
 
 PKGVER=		2.1.30
 DISTNAME=	openmotif${PKGVER}
 PKGNAME=	openmotif-${PKGVER}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MOTIF_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R${PKGVER}/ \
 		ftp://ftp.opengroup.org/pub/openmotif/R${PKGVER}/ \
diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo
index 130dada8107..c45b71dd70e 100644
--- a/x11/openmotif/distinfo
+++ b/x11/openmotif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2004/12/18 00:39:31 tron Exp $
+$NetBSD: distinfo,v 1.14.2.1 2005/03/11 06:45:03 snj Exp $
 
 SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc
 Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes
@@ -46,4 +46,4 @@ SHA1 (patch-be) = 35a24957def48a2f2771f34ebc53ecf83c827a66
 SHA1 (patch-bf) = 211d84bccf91ed474634658a75af5d8977b052d4
 SHA1 (patch-bg) = 582f455b066bd4f12160d719c885e9d8423632e5
 SHA1 (patch-bh) = 4025190b6200398b54cfa075da8976e96bf7c3ee
-SHA1 (patch-bi) = b11a6493500c3d7dec379a2e73f42d7752f471ba
+SHA1 (patch-bi) = 4dced20ce293f8635f121f77e9112e93766b9723
diff --git a/x11/openmotif/patches/patch-bi b/x11/openmotif/patches/patch-bi
index 2642d951fd4..816118a9eb9 100644
--- a/x11/openmotif/patches/patch-bi
+++ b/x11/openmotif/patches/patch-bi
@@ -1,8 +1,8 @@
-$NetBSD: patch-bi,v 1.1 2004/12/18 00:39:31 tron Exp $
+$NetBSD: patch-bi,v 1.1.2.1 2005/03/11 06:45:03 snj Exp $
 
---- lib/Xm/Xpmscan.c.orig	2000-04-28 16:05:21.000000000 +0100
-+++ lib/Xm/Xpmscan.c	2004-12-17 23:42:33.000000000 +0000
-@@ -93,7 +93,8 @@
+--- lib/Xm/Xpmscan.c.orig	2000-04-28 17:05:21.000000000 +0200
++++ lib/Xm/Xpmscan.c
+@@ -93,7 +93,8 @@ LFUNC(MSWGetImagePixels, int, (Display *
  LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
  				  XpmAttributes *attributes));
  
@@ -12,7 +12,7 @@ $NetBSD: patch-bi,v 1.1 2004/12/18 00:39:31 tron Exp $
  			     Pixel *pixels, unsigned int mask,
  			     unsigned int cpp, XpmAttributes *attributes));
  
-@@ -220,11 +221,17 @@
+@@ -220,11 +221,17 @@ XpmCreateXpmImageFromImage(display, imag
      else
  	cpp = 0;
  
@@ -30,7 +30,7 @@ $NetBSD: patch-bi,v 1.1 2004/12/18 00:39:31 tron Exp $
      pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
      if (!pmap.pixels)
  	RETURN(XpmNoMemory);
-@@ -279,7 +286,8 @@
+@@ -279,7 +286,8 @@ XpmCreateXpmImageFromImage(display, imag
       * get rgb values and a string of char, and possibly a name for each
       * color
       */
@@ -40,7 +40,7 @@ $NetBSD: patch-bi,v 1.1 2004/12/18 00:39:31 tron Exp $
      colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
      if (!colorTable)
  	RETURN(XpmNoMemory);
-@@ -327,6 +335,8 @@
+@@ -327,6 +335,8 @@ ScanTransparentColor(color, cpp, attribu
  
      /* first get a character string */
      a = 0;
@@ -49,7 +49,7 @@ $NetBSD: patch-bi,v 1.1 2004/12/18 00:39:31 tron Exp $
      if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
  	return (XpmNoMemory);
      *s++ = printable[c = a % MAXPRINTABLE];
-@@ -374,7 +384,7 @@
+@@ -374,7 +384,7 @@ static int
  ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
      Display *display;
      XpmColor *colors;
@@ -58,7 +58,7 @@ $NetBSD: patch-bi,v 1.1 2004/12/18 00:39:31 tron Exp $
      Pixel *pixels;
      unsigned int mask;
      unsigned int cpp;
-@@ -418,6 +428,8 @@
+@@ -418,6 +428,8 @@ ScanOtherColors(display, colors, ncolors
      }
  
      /* first get character strings and rgb values */
@@ -67,3 +67,13 @@ $NetBSD: patch-bi,v 1.1 2004/12/18 00:39:31 tron Exp $
      xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
      if (!xcolors)
  	return (XpmNoMemory);
+@@ -585,6 +597,9 @@ GetImagePixels(image, width, height, pma
+     ibpp = image->bits_per_pixel;
+     offset = image->xoffset;
+ 
++    if (image->bitmap_unit < 0)
++	    return (XpmNoMemory);
++
+     if ((image->bits_per_pixel | image->depth) == 1) {
+ 	ibu = image->bitmap_unit;
+ 	for (y = 0; y < height; y++)