From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 24 Dec 2014 20:54:20 +0000 (+0000)
Subject: Tidy SeekBlob() method.
X-Git-Tag: 7.0.1-0~1559
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01409b60679c4ed2b62a77c5d453eb8c40bea3cc;p=imagemagick

Tidy SeekBlob() method.
---

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 4319424ed..6119b3412 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -3703,27 +3703,27 @@ MagickExport MagickOffsetType SeekBlob(Image *image,
           break;
         }
       }
-      if (image->blob->offset <= (MagickOffsetType)
+      if (image->blob->offset < (MagickOffsetType)
           ((off_t) image->blob->length))
-        image->blob->eof=MagickFalse;
-      else
-        if (image->blob->mapped != MagickFalse)
+        {
+          image->blob->eof=MagickFalse;
+          break;
+        }
+      if (image->blob->offset < (MagickOffsetType)
+          ((off_t) image->blob->extent))
+        break;
+      if (image->blob->mapped != MagickFalse)
+        return(-1);
+      image->blob->extent=(size_t) (image->blob->offset+image->blob->quantum);
+      image->blob->quantum<<=1;
+      image->blob->data=(unsigned char *) ResizeQuantumMemory(image->blob->data,
+        image->blob->extent+1,sizeof(*image->blob->data));
+      (void) SyncBlob(image);
+      if (image->blob->data == (unsigned char *) NULL)
+        {
+          (void) DetachBlob(image->blob);
           return(-1);
-        else
-          {
-            image->blob->extent=(size_t) (image->blob->offset+
-              image->blob->quantum);
-            image->blob->quantum<<=1;
-            image->blob->data=(unsigned char *) ResizeQuantumMemory(
-              image->blob->data,image->blob->extent+1,
-              sizeof(*image->blob->data));
-            (void) SyncBlob(image);
-            if (image->blob->data == (unsigned char *) NULL)
-              {
-                (void) DetachBlob(image->blob);
-                return(-1);
-              }
-          }
+        }
       break;
     }
   }