From: dirk <dirk@git.imagemagick.org>
Date: Mon, 29 Dec 2014 22:23:28 +0000 (+0000)
Subject: Moved EOF check.
X-Git-Tag: 7.0.1-0~1520
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e2b7d0d8ee0bf88fdba57059fcb87aef8f23c06;p=imagemagick

Moved EOF check.
---

diff --git a/coders/dds.c b/coders/dds.c
index 12238f9c0..d8319bd4b 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -2365,16 +2365,16 @@ static MagickBooleanType SkipDXTMipmaps(Image *image,DDSInfo *dds_info,
   /*
     Only skip mipmaps for textures and cube maps
   */
+  if (EOFBlob(image) != MagickFalse)
+    {
+      ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+        image->filename);
+      return(MagickFalse);
+    }
   if (dds_info->ddscaps1 & DDSCAPS_MIPMAP
       && (dds_info->ddscaps1 & DDSCAPS_TEXTURE
           || dds_info->ddscaps2 & DDSCAPS2_CUBEMAP))
     {
-      if (EOFBlob(image) != MagickFalse)
-        {
-          ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
-            image->filename);
-          return(MagickFalse);
-        }
       w = DIV2(dds_info->width);
       h = DIV2(dds_info->height);
       
@@ -2412,16 +2412,16 @@ static MagickBooleanType SkipRGBMipmaps(Image *image,DDSInfo *dds_info,
   /*
     Only skip mipmaps for textures and cube maps
   */
+  if (EOFBlob(image) != MagickFalse)
+    {
+      ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+        image->filename);
+      return(MagickFalse);
+    }
   if (dds_info->ddscaps1 & DDSCAPS_MIPMAP
       && (dds_info->ddscaps1 & DDSCAPS_TEXTURE
           || dds_info->ddscaps2 & DDSCAPS2_CUBEMAP))
     {
-      if (EOFBlob(image) != MagickFalse)
-        {
-          ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
-            image->filename);
-          return(MagickFalse);
-        }
       w = DIV2(dds_info->width);
       h = DIV2(dds_info->height);