From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 16 Dec 2014 19:43:32 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1615
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=216e0330eee93ba2fa460b8f52bbfa199b381799;p=imagemagick

---

diff --git a/coders/pnm.c b/coders/pnm.c
index 7b501fd45..67325a2a1 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -153,8 +153,8 @@ static void PNMComment(Image *image,ExceptionInfo *exception)
     Read comment.
   */
   comment=AcquireString(GetImageProperty(image,"comment",exception));
-  extent=MaxTextExtent;
   p=comment+strlen(comment);
+  extent=strlen(comment)+MaxTextExtent;
   for (c='#'; (c != EOF) && (c != (int) '\n'); p++)
   {
     if ((size_t) (p-comment+1) >= extent)
diff --git a/coders/xpm.c b/coders/xpm.c
index 72cd64778..bdbb514d7 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -157,7 +157,7 @@ static size_t CopyXPMColor(char *destination,const char *source,size_t length)
     *p;
 
   p=source;
-  while (length-- && (*p != '\0'))
+  while (--length && (*p != '\0'))
     *destination++=(*p++);
   *destination='\0';
   return((size_t) (p-source));