From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 18 Apr 2014 01:48:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2449
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5260121579546f3112be085c65789310ba8daaab;p=imagemagick

---

diff --git a/MagickCore/log.c b/MagickCore/log.c
index 0be742b10..0790fbc36 100644
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -750,6 +750,8 @@ MagickExport MagickBooleanType ListLogInfo(FILE *file,ExceptionInfo *exception)
               (void) FormatLocaleFile(file,"%s ",LogHandlers[j].name);
               length+=strlen(LogHandlers[j].name);
             }
+          if (LogHandlers[j].name == (const char * NULL))
+            break;
         }
         for (j=(ssize_t) length; j <= 12; j++)
           (void) FormatLocaleFile(file," ");
diff --git a/coders/pes.c b/coders/pes.c
index 33f3ce679..20d233886 100644
--- a/coders/pes.c
+++ b/coders/pes.c
@@ -505,7 +505,7 @@ static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception)
   for (i=0; i < (ssize_t) number_colors; i++)
   {
     j=(int) ReadBlobByte(image);
-    blocks[i].color=PESColor+j;
+    blocks[i].color=PESColor+(j < 0 ? 0 : j);
     blocks[i].offset=0;
   }
   for ( ; i < 256L; i++)