(no commit message)

diff --git a/coders/gray.c b/coders/gray.c
index 68e00712815a6f1c82e79c256103a05dbcbc018b..8802d2df290528d6a9fd7d2bd6258d322d0d04f2 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -246,6 +246,12 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
         }
     }
     SetQuantumImageType(image,quantum_type);
+    if (EOFBlob(image) != MagickFalse)
+      {
+        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+          image->filename);
+        break;
+      }
     /*
       Proceed to next image.
     */

diff --git a/coders/rgb.c b/coders/rgb.c
index 8dfef38452d6a9e44fc54ccd4c55f16a83c0c0ed..a9fcce5c557d575f89be569f81358262c362f2e5 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -560,6 +560,12 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       }
     }
     SetQuantumImageType(image,quantum_type);
+    if (EOFBlob(image) != MagickFalse)
+      {
+        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+          image->filename);
+        break;
+      }
     /*
       Proceed to next image.
     */

diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index 14c87c94a8d8b1b39bf4e3d105c6166874c2fddd..52ec55e6d8c653a6cf8e7ae681a7faee7c76c88a 100644 (file)
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -787,6 +787,12 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
       }
     }
     SetQuantumImageType(image,quantum_type);
+    if (EOFBlob(image) != MagickFalse)
+      {
+        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+          image->filename);
+        break;
+      }
     /*
       Proceed to next image.
     */

diff --git a/version.sh b/version.sh
index 6c00462ef2f335349025725315fae8e1b7f7f85d..71b49dd17ef4c83e9f5b2196aa4e3c7010082c82 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.5.5'
 PACKAGE_LIB_VERSION="0x655"
-PACKAGE_RELEASE="10"
+PACKAGE_RELEASE="9"
 PACKAGE_LIB_VERSION_NUMBER="6,5,5,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"

diff --git a/wand/animate.c b/wand/animate.c
index 2304da2a583e58d8a262e1cae4dc299ea70a571e..463965181463a37b96e29c38b43abe7d3f13b64b 100644 (file)
--- a/wand/animate.c
+++ b/wand/animate.c
@@ -1411,6 +1411,8 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
   if (image == (Image *) NULL)
     ThrowAnimateException(OptionError,"MissingAnImageFilename",argv[argc-1])
   FinalizeImageSettings(image_info,image,MagickTrue);
+  if (image == (Image *) NULL)
+    ThrowAnimateException(OptionError,"MissingAnImageFilename",argv[argc-1])
   if (resource_info.window_id != (char *) NULL)
     {
       XAnimateBackgroundImage(display,&resource_info,image);

diff --git a/wand/compare.c b/wand/compare.c
index e53f58f949acae953f74e39e7017884b20672f79..fe96b4cacf7aae9de4cdd930a8a48574c1cf3956 100644 (file)
--- a/wand/compare.c
+++ b/wand/compare.c
@@ -902,6 +902,8 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
   if ((image == (Image *) NULL) || (GetImageListLength(image) < 2))
     ThrowCompareException(OptionError,"MissingAnImageFilename",argv[i]);
   FinalizeImageSettings(image_info,image,MagickTrue);
+  if ((image == (Image *) NULL) || (GetImageListLength(image) < 2))
+    ThrowCompareException(OptionError,"MissingAnImageFilename",argv[i]);
   image=GetImageFromList(image,0);
   reconstruct_image=GetImageFromList(image,1);
   similarity_image=SimilarityImage(image,reconstruct_image,&offset,

diff --git a/wand/composite.c b/wand/composite.c
index 1ebc959b5f3cfe2ee431d5192e9aa284ee5705d2..678bd53c14bd66fbc9fe98b73138256ad24fb4a7 100644 (file)
--- a/wand/composite.c
+++ b/wand/composite.c
@@ -1592,6 +1592,8 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
   if ((image == (Image *) NULL) || (GetImageListLength(image) < 2))
     ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[argc-1]);
   FinalizeImageSettings(image_info,image,MagickTrue);
+  if ((image == (Image *) NULL) || (GetImageListLength(image) < 2))
+    ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[argc-1]);
   /*
     Composite images.
   */

diff --git a/wand/convert.c b/wand/convert.c
index 277112dbaeb32f491c7f1effcfd0aa410f1e96d1..f6332628def683e4d87954166b007cc3cebc06c2 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -2818,6 +2818,8 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
   if (image == (Image *) NULL)
     ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]);
   FinalizeImageSettings(image_info,image,MagickTrue);
+  if (image == (Image *) NULL)
+    ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]);
   status&=WriteImages(image_info,image,argv[argc-1],exception);
   if (metadata != (char **) NULL)
     {

diff --git a/wand/mogrify-private.h b/wand/mogrify-private.h
index 3e53259cca3bb39471429fb351e032dba4161b65..e964769d318c05bcc5ee07149492bd2bf3309bde 100644 (file)
--- a/wand/mogrify-private.h
+++ b/wand/mogrify-private.h
@@ -40,7 +40,8 @@ extern "C" {
 { \
   ResetImageOptions(image_info); \
   FireImageStack(MagickTrue,advance,MagickTrue); \
-  (void) SyncImagesSettings(image_info,image); \
+  if (image != (Image *) NULL) \
+    (void) SyncImagesSettings(image_info,image); \
 }
 #define FireImageStack(postfix,advance,fire) \
   if ((j <= i) && (i < argc)) \

diff --git a/wand/mogrify.c b/wand/mogrify.c
index a6d0beb248bc334e47ae086db7f6efea535ca09e..0a39345fddd8e85b8687760eb641cfac2d2c83ec 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -7204,6 +7204,8 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
   status=MagickTrue;
   for (i=0; i < (long) argc; i++)
   {
+if (*images == (Image *) NULL)
+  break;
     option=argv[i];
     if (IsMagickOption(option) == MagickFalse)
       continue;

diff --git a/wand/montage.c b/wand/montage.c
index 3668860b8d8714b223f5b3fd40a387b8ec710168..42ceb4e151f2d148044db065416b9bdf58caed31 100644 (file)
--- a/wand/montage.c
+++ b/wand/montage.c
@@ -1666,6 +1666,8 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
   if (image == (Image *) NULL)
     ThrowMontageException(OptionError,"MissingAnImageFilename",argv[argc-1]);
   FinalizeImageSettings(image_info,image,MagickTrue);
+  if (image == (Image *) NULL)
+    ThrowMontageException(OptionError,"MissingAnImageFilename",argv[argc-1]);
   (void) CopyMagickString(montage_info->filename,argv[argc-1],MaxTextExtent);
   montage_image=MontageImageList(image_info,montage_info,image,exception);
   if (montage_image == (Image *) NULL)

diff --git a/wand/stream.c b/wand/stream.c
index ec6f0391ee1386f86ad8db2f18262d206a18fefd..321b73d2c4b2bb98f42ab4d06e383e057a2da799 100644 (file)
--- a/wand/stream.c
+++ b/wand/stream.c
@@ -740,6 +740,8 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
   if (image == (Image *) NULL)
     ThrowStreamException(OptionError,"MissingAnImageFilename",argv[i]);
   FinalizeImageSettings(image_info,image,MagickTrue);
+  if (image == (Image *) NULL)
+    ThrowStreamException(OptionError,"MissingAnImageFilename",argv[i]);
   DestroyStream();
   return(status != 0 ? MagickTrue : MagickFalse);
 }