(no commit message)

diff --git a/coders/miff.c b/coders/miff.c
index 8b9c5d1541c7ce57f6fe01e1546b27756f33766c..20a235243434bae98f0d80d0323aeda61cdb6733 100644 (file)
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1387,8 +1387,11 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                 if (version != 0.0)
                   length=(size_t) ReadBlobMSBLong(image);
                 if (length > compress_extent)
-                  ThrowReaderException(CorruptImageError,
-                    "UnableToReadImageData");
+                  {
+                    (void) BZ2_bzDecompressEnd(&bzip_info);
+                    ThrowReaderException(CorruptImageError,
+                      "UnableToReadImageData");
+                  }
                 bzip_info.avail_in=(unsigned int) ReadBlob(image,length,
                   (unsigned char *) bzip_info.next_in);
               }
@@ -1421,8 +1424,11 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                 lzma_info.next_in=compress_pixels;
                 length=(size_t) ReadBlobMSBLong(image);
                 if (length > compress_extent)
-                  ThrowReaderException(CorruptImageError,
-                    "UnableToReadImageData");
+                  {
+                    lzma_end(&lzma_info);
+                    ThrowReaderException(CorruptImageError,
+                      "UnableToReadImageData");
+                  }
                 lzma_info.avail_in=(unsigned int) ReadBlob(image,length,
                   (unsigned char *) lzma_info.next_in);
               }
@@ -1458,8 +1464,11 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                 if (version != 0.0)
                   length=(size_t) ReadBlobMSBLong(image);
                 if (length > compress_extent)
-                  ThrowReaderException(CorruptImageError,
-                    "UnableToReadImageData");
+                  {
+                    (void) inflateEnd(&zip_info);
+                    ThrowReaderException(CorruptImageError,
+                      "UnableToReadImageData");
+                  }
                 zip_info.avail_in=(unsigned int) ReadBlob(image,length,
                   zip_info.next_in);
               }

diff --git a/configure b/configure
index de94746638fa06cebe4af79a19570e4fc5c1892d..92e53a02a9ad7da0630795ef667e61a542820ede 100755 (executable)
--- a/configure
+++ b/configure
@@ -4379,7 +4379,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=19272M
+MAGICK_SVN_REVISION=19297
 
 
 # Substitute library versioning