commit d4297029a6faeb030aa4da519db921992dda664f
author cristy <urban-warrior@git.imagemagick.org> Thu Sep 16 22:59:09 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Sep 16 22:59:09 2010 +0000
tree df6bb4fd91f207082058c0133579bbe9fd0236e2
parent c1af14f737ae451feaec2a8eb0be98e04a55eee5

coders/rgb.c

diff --git a/coders/rgb.c b/coders/rgb.c
index 252b3ca..0ec26f2 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -149,13 +149,9 @@
           image=DestroyImageList(image);
           return((Image *) NULL);
         }
-      for (i=0; i < image->offset; i++)
-        if (ReadBlobByte(image) == EOF)
-          {
-            ThrowFileException(exception,CorruptImageError,
-              "UnexpectedEndOfFile",image->filename);
-            break;
-          }
+      if (DiscardBlobBytes(image,image->offset) == MagickFalse)
+        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+          image->filename);
     }
   /*
     Create virtual canvas to support cropping (i.e. image.rgb[100x100+10+20]).
@@ -636,13 +632,9 @@
             image=DestroyImageList(image);
             return((Image *) NULL);
           }
-        for (i=0; i < image->offset; i++)
-          if (ReadBlobByte(image) == EOF)
-            {
-              ThrowFileException(exception,CorruptImageError,
-                "UnexpectedEndOfFile",image->filename);
-              break;
-            }
+        if (DiscardBlobBytes(image,image->offset) == MagickFalse)
+          ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+            image->filename);
         length=GetQuantumExtent(canvas_image,quantum_info,RedQuantum);
         for (i=0; i < (ssize_t) scene; i++)
           for (y=0; y < (ssize_t) image->extract_info.height; y++)