From: cristy Date: Mon, 26 Oct 2009 13:01:42 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10454 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3692e2f9a4da46a2c1cbd363256fd83173776c49;p=imagemagick --- diff --git a/magick/semaphore.c b/magick/semaphore.c index 2b544847c..cb48f460b 100644 --- a/magick/semaphore.c +++ b/magick/semaphore.c @@ -114,10 +114,13 @@ static void MagickExport void AcquireSemaphoreInfo(SemaphoreInfo **semaphore_info) { assert(semaphore_info != (SemaphoreInfo **) NULL); - LockMagickMutex(); if (*semaphore_info == (SemaphoreInfo *) NULL) - *semaphore_info=AllocateSemaphoreInfo(); - UnlockMagickMutex(); + { + LockMagickMutex(); + if (*semaphore_info == (SemaphoreInfo *) NULL) + *semaphore_info=AllocateSemaphoreInfo(); + UnlockMagickMutex(); + } } /* @@ -283,7 +286,6 @@ static void LockMagickMutex(void) MagickExport MagickBooleanType LockSemaphoreInfo(SemaphoreInfo *semaphore_info) { assert(semaphore_info != (SemaphoreInfo *) NULL); - assert(semaphore_info->signature == MagickSignature); #if defined(MAGICKCORE_HAVE_PTHREAD) { int @@ -459,7 +461,6 @@ MagickExport MagickBooleanType UnlockSemaphoreInfo( SemaphoreInfo *semaphore_info) { assert(semaphore_info != (SemaphoreInfo *) NULL); - assert(semaphore_info->signature == MagickSignature); #if defined(MAGICKCORE_DEBUG) assert(IsMagickThreadEqual(semaphore_info->id) != MagickFalse); if (semaphore_info->reference_count == 0)