summaryrefslogtreecommitdiff
path: root/x11/lesstif/patches/patch-ac
blob: 4bc70fd42cc3d0b153f0e4cf1df112d68bfb0543 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
$NetBSD: patch-ac,v 1.17 2005/03/10 16:07:27 wiz Exp $

--- lib/Xm-2.1/Xpmscan.c.orig	2004-11-18 22:00:59.000000000 +0100
+++ lib/Xm-2.1/Xpmscan.c
@@ -672,8 +672,8 @@ GetImagePixels(image, width, height, pma
     char *dst;
     unsigned int *iptr;
     char *data;
-    unsigned int x, y, i;
-    int bits, depth, ibu, ibpp, offset;
+    unsigned int x, y;
+    int bits, depth, ibu, ibpp, offset, i;
     unsigned long lbt;
     Pixel pixel, px;
 
@@ -684,6 +684,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++)