From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 31 Dec 2014 12:06:30 +0000 (+0000)
Subject: Exit XPM if there are not enough pixels.
X-Git-Tag: 7.0.1-0~1514
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5463e2e01503c6cfe10c95ab1cfa3f85ff46de69;p=imagemagick

Exit XPM if there are not enough pixels.
---

diff --git a/coders/xpm.c b/coders/xpm.c
index 9b73552a6..1279603c0 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -151,7 +151,7 @@ static int CompareXPMColor(const void *target,const void *source)
   return(strcmp(p,q));
 }
 
-static size_t CopyXPMColor(char *destination,const char *source,size_t length)
+static ssize_t CopyXPMColor(char *destination,const char *source,size_t length)
 {
   register const char
     *p;
@@ -161,7 +161,7 @@ static size_t CopyXPMColor(char *destination,const char *source,size_t length)
     *destination++=(*p++);
   if (length != 0)
     *destination='\0';
-  return((size_t) (p-source));
+  return((ssize_t) (p-source));
 }
 
 static char *NextXPMLine(char *p)
@@ -431,13 +431,18 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          p+=CopyXPMColor(key,p,MagickMin(width,MaxTextExtent-1));
+          ssize_t count=CopyXPMColor(key,p,MagickMin(width,MaxTextExtent-1));
+          if (count != (ssize_t) width)
+            break;
           j=(ssize_t) GetValueFromSplayTree(xpm_colors,key);
           if (image->storage_class == PseudoClass)
             SetPixelIndex(image,(Quantum) j,r);
           SetPixelInfoPixel(image,image->colormap+j,r);
+          p+=count;
           r+=GetPixelChannels(image);
         }
+        if (x < (ssize_t) image->columns)
+          break;
         if (SyncAuthenticPixels(image,exception) == MagickFalse)
           break;
       }