From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 24 Jan 2010 18:41:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10063
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84ed5c299b704dffe80ad526b1d7cc294d3d33b9;p=imagemagick

---

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 693840e87..7de0ac8df 100644
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -667,7 +667,6 @@ coders_pcx_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_pcx_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_pcx_la_LIBADD       = $(MAGICKCORE_LIBS)
 
-
 # PDB coder module
 coders_pdb_la_SOURCES      = coders/pdb.c
 coders_pdb_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
@@ -967,4 +966,3 @@ coders_yuv_la_SOURCES      = coders/yuv.c
 coders_yuv_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_yuv_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_yuv_la_LIBADD       = $(MAGICKCORE_LIBS)
-
diff --git a/coders/pes.c b/coders/pes.c
index ce645d218..93e41d152 100644
--- a/coders/pes.c
+++ b/coders/pes.c
@@ -137,6 +137,12 @@ static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception)
   MagickBooleanType
     status;
 
+  ssize_t
+    count;
+
+  unsigned char
+    magick[4];
+
   /*
     Open image file.
   */
@@ -154,6 +160,9 @@ static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception)
       image=DestroyImageList(image);
       return((Image *) NULL);
     }
+  count=ReadBlob(image,4,magick);
+  if ((count != 4) || (LocaleNCompare((char *) magick,"#PES",4) != 0))
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
   return(GetFirstImageInList(image));
 }
 
@@ -188,9 +197,9 @@ ModuleExport unsigned long RegisterPESImage(void)
   entry=SetMagickInfo("PES");
   entry->decoder=(DecodeImageHandler *) ReadPESImage;
   entry->magick=(IsImageFormatHandler *) IsPES;
-  entry->adjoin=MagickFalse;
   entry->description=ConstantString("Brother PES");
   entry->module=ConstantString("PES");
+  (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }