]> granicus.if.org Git - imagemagick/commitdiff
Revert, more analysis needed
authorCristy <urban-warrior@imagemagick.org>
Wed, 24 Jan 2018 12:31:35 +0000 (07:31 -0500)
committerCristy <urban-warrior@imagemagick.org>
Wed, 24 Jan 2018 12:31:35 +0000 (07:31 -0500)
MagickCore/quantum.c

index cfff6c5a7cc88f8902b7de0f739245f1232ba372..c7cd604c887673399cf17351a0149f42713cdd7f 100644 (file)
@@ -174,15 +174,15 @@ static MagickBooleanType AcquireQuantumPixels(QuantumInfo *quantum_info,
     unsigned char
       *pixels;
 
-    quantum_info->pixels[i]=AcquireVirtualMemory(4*(extent+1),sizeof(*pixels));
+    quantum_info->pixels[i]=AcquireVirtualMemory((extent+1),sizeof(*pixels));
     if (quantum_info->pixels[i] == (MemoryInfo *) NULL)
       {
         DestroyQuantumPixels(quantum_info);
         return(MagickFalse);
       }
     pixels=(unsigned char *)  GetVirtualMemoryBlob(quantum_info->pixels[i]);
-    (void) ResetMagickMemory(pixels,0,4*(extent+1)*sizeof(*pixels));
-    pixels[4*extent]=QuantumSignature;
+    (void) ResetMagickMemory(pixels,0,(extent+1)*sizeof(*pixels));
+    pixels[extent]=QuantumSignature;
   }
   return(MagickTrue);
 }
@@ -267,7 +267,7 @@ static void DestroyQuantumPixels(QuantumInfo *quantum_info)
           Did we overrun our quantum buffer?
         */
         pixels=(unsigned char *) GetVirtualMemoryBlob(quantum_info->pixels[i]);
-        assert(pixels[4*extent] == QuantumSignature);
+        assert(pixels[extent] == QuantumSignature);
         quantum_info->pixels[i]=RelinquishVirtualMemory(
           quantum_info->pixels[i]);
       }