revert memory leak patch

ImageMagick · Nov 24, 2021 · 34266d6 · 34266d6
1 parent 2b6531d
commit 34266d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
@@ -127,9 +127,6 @@ typedef struct _NexusInfo
 
   struct _NexusInfo
     *virtual_nexus;
-
-  SemaphoreInfo
-    *semaphore;
 } NexusInfo;
 
 typedef struct _CacheInfo

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
@@ -280,7 +280,6 @@ MagickPrivate NexusInfo **AcquirePixelCacheNexus(const size_t number_threads)
     nexus_info[i]=(*nexus_info+i);
     if (i < (ssize_t) number_threads)
       nexus_info[i]->virtual_nexus=(*nexus_info+number_threads+i);
-    nexus_info[i]->semaphore=AcquireSemaphoreInfo();
     nexus_info[i]->signature=MagickCoreSignature;
   }
   return(nexus_info);
@@ -1128,8 +1127,6 @@ MagickPrivate NexusInfo **DestroyPixelCacheNexus(NexusInfo **nexus_info,
   {
     if (nexus_info[i]->cache != (Quantum *) NULL)
       RelinquishCacheNexusPixels(nexus_info[i]);
-    if (nexus_info[i]->semaphore != (SemaphoreInfo *) NULL)
-      RelinquishSemaphoreInfo(&nexus_info[i]->semaphore);
     nexus_info[i]->signature=(~MagickCoreSignature);
   }
   *nexus_info=(NexusInfo *) RelinquishMagickMemory(*nexus_info);
@@ -5096,23 +5093,14 @@ static Quantum *SetPixelCacheNexusPixels(
   if (cache_info->metacontent_extent != 0)
     length+=number_pixels*cache_info->metacontent_extent;
   status=MagickTrue;
-  if ((nexus_info->cache == (Quantum *) NULL) || (nexus_info->length < length))
-    {
-      /*
-        Allocate or grow nexus pixel cache.
-      */
-      LockSemaphoreInfo(nexus_info->semaphore);
-      if (nexus_info->cache == (Quantum *) NULL)
+  if (nexus_info->cache == (Quantum *) NULL)
+    status=AcquireCacheNexusPixels(cache_info,length,nexus_info,exception);
+  else
+    if (nexus_info->length < length)
+      {
+        RelinquishCacheNexusPixels(nexus_info);
         status=AcquireCacheNexusPixels(cache_info,length,nexus_info,exception);
-      else
-        if (nexus_info->length < length)
-          {
-            RelinquishCacheNexusPixels(nexus_info);
-            status=AcquireCacheNexusPixels(cache_info,length,nexus_info,
-              exception);
-          }
-      UnlockSemaphoreInfo(nexus_info->semaphore);
-    }
+      }
   if (status == MagickFalse)
     return((Quantum *) NULL);
   nexus_info->pixels=nexus_info->cache;