(no commit message)

diff --git a/MagickCore/log.c b/MagickCore/log.c
index 0be742b109ed9a01c89d0cf4ae214b87d3e15719..0790fbc3645945599dd515b2884b2b32753587de 100644 (file)
--- 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 33f3ce6799b3bc6b61f57c1309e89f65f5242f52..20d2338864bd6e8ed634d11822bab167334e93c1 100644 (file)
--- 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++)