revert memory leak patch

ImageMagick · Nov 24, 2021 · e735d88 · e735d88
1 parent fa5c3aa
commit e735d88
Show file tree

Hide file tree

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

diff --git a/magick/cache.c b/magick/cache.c
@@ -446,7 +446,6 @@ MagickExport 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=AllocateSemaphoreInfo();
     nexus_info[i]->signature=MagickCoreSignature;
   }
   return(nexus_info);
@@ -1260,8 +1259,6 @@ MagickExport NexusInfo **DestroyPixelCacheNexus(NexusInfo **nexus_info,
   {
     if (nexus_info[i]->cache != (PixelPacket *) NULL)
       RelinquishCacheNexusPixels(nexus_info[i]);
-    if (nexus_info[i]->semaphore != (SemaphoreInfo *) NULL)
-      DestroySemaphoreInfo(&nexus_info[i]->semaphore);
     nexus_info[i]->signature=(~MagickCoreSignature);
   }
   *nexus_info=(NexusInfo *) RelinquishMagickMemory(*nexus_info);
@@ -5239,23 +5236,14 @@ static PixelPacket *SetPixelCacheNexusPixels(
   if (cache_info->active_index_channel != MagickFalse)
     length+=number_pixels*sizeof(IndexPacket);
   status=MagickTrue;
-  if ((nexus_info->cache == (PixelPacket *) NULL) ||
-      (nexus_info->length < length))
-    {
-      /*
-        Allocate or grow nexus pixel cache.
-      */
-      if (nexus_info->cache == (PixelPacket *) NULL)
+  if (nexus_info->cache == (PixelPacket *) 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)
     {
       (void) memset(&nexus_info->region,0,sizeof(nexus_info->region));