(getScanline): Handle unpadded bitmaps.

1 files changed, 4 insertions, 2 deletions

diff --git a/gnu/java/awt/image/XBMDecoder.java b/gnu/java/awt/image/XBMDecoder.java
index 27608ba97..3a89f42e6 100644
--- a/gnu/java/awt/image/XBMDecoder.java
+++ b/gnu/java/awt/image/XBMDecoder.java
@@ -75,7 +75,7 @@ public class XBMDecoder extends ImageDecoder
     int scanline[] = new int[len];
     int x = 0;
 
-    while (true)
+    while (x < len)
       {
 	int ch = in.read ();
 	if (ch == '0')
@@ -89,7 +89,7 @@ public class XBMDecoder extends ImageDecoder
 
 	    for (int i = 0; i < 8; i++, x++)
 	      {
-		if (x == len)
+		if (x == len)	// condition occurs if bitmap is padded
 		  return scanline;
 
 		scanline[x] = ((byteVal >> i & 0x1) == 1) ? 
@@ -97,5 +97,7 @@ public class XBMDecoder extends ImageDecoder
 	      }
 	  }	
       }
+
+    return scanline;
   }
 }