commit bd797f1c50b04bfd5b035f4e0a9e101eaba3f105
author cristy <urban-warrior@git.imagemagick.org> Sat Jan 24 20:42:32 2015 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sat Jan 24 20:42:32 2015 +0000
tree f3829a22e209bc0e550b3d2e1871d84a236dfacd
parent 100c62ceee252ed475fca6a57b3dbaa3d27d2ed9

coders/vicar.c

diff --git a/coders/vicar.c b/coders/vicar.c
index bfac89b..345c6c5 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -149,6 +149,9 @@
     keyword[MaxTextExtent],
     value[MaxTextExtent];
 
+  const void
+    *pixels;
+
   Image
     *image;
 
@@ -175,9 +178,6 @@
     count,
     y;
 
-  unsigned char
-    *pixels;
-
   /*
     Open image file.
   */
@@ -297,14 +297,16 @@
   quantum_info=AcquireQuantumInfo(image_info,image);
   if (quantum_info == (QuantumInfo *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-  pixels=GetQuantumPixels(quantum_info);
   length=GetQuantumExtent(image,quantum_info,quantum_type);
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
     if (q == (Quantum *) NULL)
       break;
-    count=ReadBlob(image,length,pixels);
+    pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info),
+      &count);
+    if (count != (ssize_t) length)
+      break;
     (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
       quantum_type,pixels,exception);
     if (SyncAuthenticPixels(image,exception) == MagickFalse)