]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/497
authorCristy <urban-warrior@imagemagick.org>
Tue, 23 May 2017 18:05:59 +0000 (14:05 -0400)
committerCristy <urban-warrior@imagemagick.org>
Tue, 23 May 2017 18:05:59 +0000 (14:05 -0400)
ChangeLog
MagickCore/thread.c

index a78f03a7e817217ede078358e1c7d0cfe5bf21e6..69bd1379ae31b1e6cbba9b8879fe42ce1030e2db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-23  7.0.5-8 Cristy  <quetzlzacatenango@image...>
+  * Improper allocation of memory for IM instances without threads (reference
+    https://github.com/ImageMagick/ImageMagick/issues/497).
+
 2017-05-19  7.0.5-7 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.5-6, GIT revision 20078:7ce2d38:20170519.
 
index 65b3f920e8af132b522cb12254f9e718bea1c269..e862ba17ff236da1c377bc685b8caacb03300c55 100644 (file)
@@ -96,7 +96,7 @@ MagickExport MagickBooleanType CreateMagickThreadKey(MagickThreadKey *key,
       **keys;
 
     keys=(MagickThreadValue **) key;
-    *keys=(MagickThreadValue *) AcquireQuantumMemory(1,sizeof(*keys));
+    *keys=(MagickThreadValue *) AcquireQuantumMemory(1,sizeof(**keys));
     if (*keys != (MagickThreadValue *) NULL)
       {
         (*keys)->number_threads=GetOpenMPMaximumThreads();