(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 3c49b95b4074691fbc3ead30c2aa85b96f16e742..f662cf3eeef5177b28b026be29752a7c1a7f95b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-11-01  6.5.7-4 Cristy  <quetzlzacatenango@image...>
   * Use -define delegate:bimodal=true to activate any bimodal delegates.
+  * Make sure MagickWand semaphore is acquired before locking it.
 
 2009-10-28  6.5.7-3 Cristy  <quetzlzacatenango@image...>
   * Convert SVG clipping path points from unsigned to long.

diff --git a/wand/wand.c b/wand/wand.c
index d40fcf656461d91cea5bf15e15618628641a7e6e..3247d5f778b78918eb971289b52c6ba781ff327b 100644 (file)
--- a/wand/wand.c
+++ b/wand/wand.c
@@ -113,6 +113,8 @@ WandExport unsigned long AcquireWandId(void)
 */
 WandExport void DestroyWandIds(void)
 {
+  if (wand_semaphore == (SemaphoreInfo *) NULL)
+    AcquireSemaphoreInfo(&wand_semaphore);
   (void) LockSemaphoreInfo(wand_semaphore);
   if (wand_ids != (SplayTreeInfo *) NULL)
     wand_ids=DestroySplayTree(wand_ids);