diff options
| author | wiz <wiz@pkgsrc.org> | 2005-03-10 15:23:10 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-03-10 15:23:10 +0000 |
| commit | e185c0824ab475b748b5300d179039fe4c9b8527 (patch) | |
| tree | 18cf90f2204a8917b667b0ab5ded3db5fa304a8d /graphics/xpm/patches | |
| parent | c21a44c5217432ecc6fbadb98947cd66829cd524 (diff) | |
| download | pkgsrc-e185c0824ab475b748b5300d179039fe4c9b8527.tar.gz | |
Add patch to fix CAN-2005-0605. Bump PKGREVISION.
Diffstat (limited to 'graphics/xpm/patches')
| -rw-r--r-- | graphics/xpm/patches/patch-ak | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/graphics/xpm/patches/patch-ak b/graphics/xpm/patches/patch-ak index 3b7624a8839..2485265546a 100644 --- a/graphics/xpm/patches/patch-ak +++ b/graphics/xpm/patches/patch-ak @@ -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 @@ $NetBSD: patch-ak,v 1.1 2004/09/16 15:09:01 minskim Exp $ 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++) |