]> granicus.if.org Git - imagemagick/commitdiff
Fix moment when quantum info is acquired to fix issue reported in #469.
authorDirk Lemstra <dirk@git.imagemagick.org>
Sun, 7 May 2017 07:53:16 +0000 (09:53 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Sun, 7 May 2017 07:53:16 +0000 (09:53 +0200)
coders/mat.c

index 48cde36e27d7fbe3e0215012229e53aefd0c0091..13f03849d25924b65e97d292e35ee74eba00a0d5 100644 (file)
@@ -1091,9 +1091,6 @@ RestoreMSCWarning
     (void) sample_size;
     image->columns = MATLAB_HDR.SizeX;
     image->rows = MATLAB_HDR.SizeY;
-    quantum_info=AcquireQuantumInfo(clone_info,image);
-    if (quantum_info == (QuantumInfo *) NULL)
-      ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     one=1;
     image->colors = one << image->depth;
     if (image->columns == 0 || image->rows == 0)
@@ -1121,6 +1118,9 @@ RestoreMSCWarning
     status=SetImageExtent(image,image->columns,image->rows,exception);
     if (status == MagickFalse)
       return(DestroyImageList(image));
+    quantum_info=AcquireQuantumInfo(clone_info,image);
+    if (quantum_info == (QuantumInfo *) NULL)
+      ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
 
   /* ----- Load raster data ----- */
     BImgBuff = (unsigned char *) AcquireQuantumMemory((size_t) (ldblk),sizeof(double));    /* Ldblk was set in the check phase */