(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 10b4c1bee745c42c979e02f3a1f8d45cd4c4ba70..3fb5917d602093fdf917599a1d865a18aae9221f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-09-11  6.5.5-10 Cristy  <quetzlzacatenango@image...>
   * Return the global maximum threads to avoid the rare cache view assertions.
+  * Throw an end-of-file exception for truncated raw gray images.
 
 2009-09-10  6.5.5-9 Cristy  <quetzlzacatenango@image...>
   * Do not include last line of text in the interline spacing computation.

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 78be29a36573ad718260e8fa7875716458d19418..7d810897c79f44319e27dfc029c61d56b7b54255 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.5
-%define Patchlevel  9
+%define Patchlevel  10
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/gray.c b/coders/gray.c
index 8802d2df290528d6a9fd7d2bd6258d322d0d04f2..9b7535bcd02ebd41ed3d5258fcc1d82834ae3f1b 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -197,7 +197,11 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
         length=GetQuantumExtent(canvas_image,quantum_info,quantum_type);
         count=ReadBlob(image,length,pixels);
         if (count != (ssize_t) length)
-          break;
+          {
+            ThrowFileException(exception,CorruptImageError,
+              "UnexpectedEndOfFile",image->filename);
+            break;
+          }
       }
     for (y=0; y < (long) image->extract_info.height; y++)
     {
@@ -218,6 +222,13 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
       if (SyncAuthenticPixels(canvas_image,exception) == MagickFalse)
         break;
       count=ReadBlob(image,length,pixels);
+      if ((count != (ssize_t) length) &&
+          (y < (long) (image->extract_info.height-1)))
+        {
+          ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+            image->filename);
+          break;
+        }
       if (((y-image->extract_info.y) >= 0) && 
           ((y-image->extract_info.y) < (long) image->rows))
         {
@@ -246,12 +257,6 @@ 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 a9fcce5c557d575f89be569f81358262c362f2e5..8dfef38452d6a9e44fc54ccd4c55f16a83c0c0ed 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -560,12 +560,6 @@ 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 52ec55e6d8c653a6cf8e7ae681a7faee7c76c88a..14c87c94a8d8b1b39bf4e3d105c6166874c2fddd 100644 (file)
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -787,12 +787,6 @@ 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/config/configure.xml b/config/configure.xml
index 5ce21c4a106cfa91a917b293adbe2e33f2ca584b..d804ab890f3ca762185002c408f4d4a63fdb1fb9 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x655"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,5,9"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,5,10"/>
   <configure name="RELEASE_DATE" value="2009-09-11"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 4d9e86bf86a0a8c99b89028afb81701d020683e8..99779d85cb68f8d3f9146cc26dc12f24cfa95cfb 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.5.5-9
+# Generated automatically by config.status (ImageMagick) 6.5.5-10
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

diff --git a/magick/version.h b/magick/version.h
index 4d6fe0d8a7d60ed5f89a6f38d833d5875e7377fd..2e9e8fa7f0c7dc069f0a1563602bb4ea74400163 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x655
 #define MagickLibVersionText  "6.5.5"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-9"
+#define MagickLibSubversion  "-10"
 #define MagickReleaseDate  "2009-09-11"
 #define MagickChangeDate   "20090911"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"

diff --git a/version.sh b/version.sh
index 71b49dd17ef4c83e9f5b2196aa4e3c7010082c82..6c00462ef2f335349025725315fae8e1b7f7f85d 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="9"
+PACKAGE_RELEASE="10"
 PACKAGE_LIB_VERSION_NUMBER="6,5,5,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"