From: Cristy <urban-warrior@imagemagick.org>
Date: Tue, 23 May 2017 18:05:59 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/497
X-Git-Tag: 7.0.5-8~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89629b33c357e491d41d8b2d2e74765a65479acd;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/497
---

diff --git a/ChangeLog b/ChangeLog
index a78f03a7e..69bd1379a 100644
--- 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.
 
diff --git a/MagickCore/thread.c b/MagickCore/thread.c
index 65b3f920e..e862ba17f 100644
--- a/MagickCore/thread.c
+++ b/MagickCore/thread.c
@@ -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();