pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/xpm Add patch to fix CAN-2005-0605. Bump PKGR...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f18871fd7a8b
branches: trunk
changeset: 490439:f18871fd7a8b
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Mar 10 15:23:10 2005 +0000
description:
Add patch to fix CAN-2005-0605. Bump PKGREVISION.
diffstat:
graphics/xpm/Makefile | 4 ++--
graphics/xpm/distinfo | 4 ++--
graphics/xpm/patches/patch-ak | 14 ++++++++++++--
3 files changed, 16 insertions(+), 6 deletions(-)
diffs (54 lines):
diff -r 46b38136b89e -r f18871fd7a8b graphics/xpm/Makefile
--- a/graphics/xpm/Makefile Thu Mar 10 15:18:31 2005 +0000
+++ b/graphics/xpm/Makefile Thu Mar 10 15:23:10 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2004/09/16 15:09:01 minskim Exp $
+# $NetBSD: Makefile,v 1.39 2005/03/10 15:23:10 wiz Exp $
DISTNAME= xpm-3.4k
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics x11
MASTER_SITES= http://koala.ilog.fr/ftp/pub/xpm/ \
${MASTER_SITE_XCONTRIB:=libraries/}
diff -r 46b38136b89e -r f18871fd7a8b graphics/xpm/distinfo
--- a/graphics/xpm/distinfo Thu Mar 10 15:18:31 2005 +0000
+++ b/graphics/xpm/distinfo Thu Mar 10 15:23:10 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/02/24 08:45:15 agc Exp $
+$NetBSD: distinfo,v 1.12 2005/03/10 15:23:10 wiz Exp $
SHA1 (xpm-3.4k.tar.gz) = a8eac19e5772bf7b3b177353686c1401fbf334bd
RMD160 (xpm-3.4k.tar.gz) = 65a2e58f97724a48a6834aab991341771c5a1faf
@@ -13,4 +13,4 @@
SHA1 (patch-ah) = 075229583814bbdd0a3d7ac8dcb6ad0507d182ff
SHA1 (patch-ai) = 79472013037a1866739b96e97d740378086cc46f
SHA1 (patch-aj) = 98048e40c338f69915e233aa11df0f95deff75a4
-SHA1 (patch-ak) = b84999d5e981bbe6edd6fc76310681c16263e8b5
+SHA1 (patch-ak) = a949e05f82d5ed9ce48348bcedf4811cff119a03
diff -r 46b38136b89e -r f18871fd7a8b graphics/xpm/patches/patch-ak
--- a/graphics/xpm/patches/patch-ak Thu Mar 10 15:18:31 2005 +0000
+++ b/graphics/xpm/patches/patch-ak Thu Mar 10 15:23:10 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2004/09/16 15:09:01 minskim Exp $
+$NetBSD: patch-ak,v 1.2 2005/03/10 15:23:10 wiz Exp $
---- lib/scan.c.orig Thu Mar 19 13:51:00 1998
+--- lib/scan.c.orig 1998-03-19 20:51:00.000000000 +0100
+++ lib/scan.c
@@ -103,7 +103,8 @@ LFUNC(MSWGetImagePixels, int, (Display *
LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
@@ -66,3 +66,13 @@
xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
if (!xcolors)
return (XpmNoMemory);
+@@ -615,6 +628,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++)
Home |
Main Index |
Thread Index |
Old Index