Commit 058ea84d3 for imagemagick.org

commit 058ea84d3fca3cb5fccb1be165359740f3abf7d2
Author: Cristy <urban-warrior@imagemagick.org>
Date:   Sat Nov 21 22:00:24 2026 -0500

    added locks to synchonize delete, get, and remove in a threaded environment

diff --git a/MagickCore/registry.c b/MagickCore/registry.c
index cb3de3269..69d8d2cfc 100644
--- a/MagickCore/registry.c
+++ b/MagickCore/registry.c
@@ -117,6 +117,12 @@ MagickExport MagickBooleanType DefineImageRegistry(const RegistryType type,
     *p;

   assert(option != (const char *) NULL);
+  if ((type != StringRegistryType) && (type != UndefinedRegistryType))
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),RegistryError,
+        "UnableToSetRegistry","%s",option);
+      return(MagickFalse);
+    }
   (void) CopyMagickString(key,option,MagickPathExtent);
   for (p=key; *p != '\0'; p++)
     if (*p == '=')
@@ -158,11 +164,14 @@ MagickExport MagickBooleanType DeleteImageRegistry(const char *key)
   assert(key != (const char *) NULL);
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",key);
-  if (registry == (void *) NULL)
-    return(MagickFalse);
   if (registry_semaphore == (SemaphoreInfo *) NULL)
     ActivateSemaphoreInfo(&registry_semaphore);
   LockSemaphoreInfo(registry_semaphore);
+  if (registry == (void *) NULL)
+    {
+      UnlockSemaphoreInfo(registry_semaphore);
+      return(MagickFalse);
+    }
   status=DeleteNodeFromSplayTree(registry,key);
   UnlockSemaphoreInfo(registry_semaphore);
   return(status);
@@ -207,11 +216,14 @@ MagickExport void *GetImageRegistry(const RegistryType type,const char *key,
   assert(key != (const char *) NULL);
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",key);
-  if (registry == (void *) NULL)
-    return((void *) NULL);
   if (registry_semaphore == (SemaphoreInfo *) NULL)
     ActivateSemaphoreInfo(&registry_semaphore);
   LockSemaphoreInfo(registry_semaphore);
+  if (registry == (void *) NULL)
+    {
+      UnlockSemaphoreInfo(registry_semaphore);
+      return((void *) NULL);
+    }
   registry_info=(RegistryInfo *) GetValueFromSplayTree(registry,key);
   if (registry_info == (void *) NULL)
     {
@@ -239,13 +251,13 @@ MagickExport void *GetImageRegistry(const RegistryType type,const char *key,
       {
         case ImageRegistryType:
         {
-          value=(Image *) ConstantString(((Image *)
+          value=(void *) ConstantString(((Image *)
             registry_info->value)->filename);
           break;
         }
         case ImageInfoRegistryType:
         {
-          value=(Image *) ConstantString(((ImageInfo *)
+          value=(void *) ConstantString(((ImageInfo *)
             registry_info->value)->filename);
           break;
         }
@@ -286,11 +298,19 @@ MagickExport void *GetImageRegistry(const RegistryType type,const char *key,
 */
 MagickExport char *GetNextImageRegistry(void)
 {
+  char
+    *key;
+
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
-  if (registry == (void *) NULL)
-    return((char *) NULL);
-  return((char *) GetNextKeyInSplayTree(registry));
+  if (registry_semaphore == (SemaphoreInfo *) NULL)
+    ActivateSemaphoreInfo(&registry_semaphore);
+  LockSemaphoreInfo(registry_semaphore);
+  key=(char *) NULL;
+  if (registry != (void *) NULL)
+    key=(char *) GetNextKeyInSplayTree(registry);
+  UnlockSemaphoreInfo(registry_semaphore);
+  return(key);
 }

 /*
@@ -331,7 +351,7 @@ MagickPrivate MagickBooleanType RegistryComponentGenesis(void)
 %
 %  RegistryComponentTerminus() destroys the registry component.
 %
-%  The format of the DestroyDefines method is:
+%  The format of the RegistryComponentTerminus method is:
 %
 %      void RegistryComponentTerminus(void)
 %
@@ -380,11 +400,14 @@ MagickExport void *RemoveImageRegistry(const char *key)
   assert(key != (const char *) NULL);
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",key);
-  if (registry == (void *) NULL)
-    return((void *) NULL);
   if (registry_semaphore == (SemaphoreInfo *) NULL)
     ActivateSemaphoreInfo(&registry_semaphore);
   LockSemaphoreInfo(registry_semaphore);
+  if (registry == (void *) NULL)
+    {
+      UnlockSemaphoreInfo(registry_semaphore);
+      return((void *) NULL);
+    }
   value=RemoveNodeFromSplayTree(registry,key);
   UnlockSemaphoreInfo(registry_semaphore);
   return(value);
@@ -414,41 +437,17 @@ MagickExport void ResetImageRegistryIterator(void)
 {
   if (IsEventLogging() != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
-  if (registry == (void *) NULL)
-    return;
-  ResetSplayTreeIterator(registry);
+  if (registry_semaphore == (SemaphoreInfo *) NULL)
+    ActivateSemaphoreInfo(&registry_semaphore);
+  LockSemaphoreInfo(registry_semaphore);
+  if (registry != (void *) NULL)
+    ResetSplayTreeIterator(registry);
+  UnlockSemaphoreInfo(registry_semaphore);
 }

 /*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%   S e t I m a g e R e g i s t r y                                           %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  SetImageRegistry() associates a value with an image registry key.
-%
-%  The format of the SetImageRegistry method is:
-%
-%      MagickBooleanType SetImageRegistry(const RegistryType type,
-%        const char *key,const void *value,ExceptionInfo *exception)
-%
-%  A description of each parameter follows:
-%
-%    o type: the type.
-%
-%    o key: the key.
-%
-%    o value: the value.
-%
-%    o exception: the exception.
-%
+  Private helper: relinquish a registry node and the value it owns.
 */
-
 static void *DestroyRegistryNode(void *registry_info)
 {
   RegistryInfo
@@ -476,7 +475,36 @@ static void *DestroyRegistryNode(void *registry_info)
   }
   return(RelinquishMagickMemory(p));
 }
-
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   S e t I m a g e R e g i s t r y                                           %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  SetImageRegistry() associates a value with an image registry key.
+%
+%  The format of the SetImageRegistry method is:
+%
+%      MagickBooleanType SetImageRegistry(const RegistryType type,
+%        const char *key,const void *value,ExceptionInfo *exception)
+%
+%  A description of each parameter follows:
+%
+%    o type: the type.
+%
+%    o key: the key.
+%
+%    o value: the value.
+%
+%    o exception: the exception.
+%
+*/
 MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
   const char *key,const void *value,ExceptionInfo *exception)
 {
@@ -546,7 +574,9 @@ MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
     return(MagickFalse);
   registry_info=(RegistryInfo *) AcquireCriticalMemory(sizeof(*registry_info));
   (void) memset(registry_info,0,sizeof(*registry_info));
-  registry_info->type=type;
+  registry_info->type=StringRegistryType;
+  if ((type == ImageRegistryType) || (type == ImageInfoRegistryType))
+    registry_info->type=type;
   registry_info->value=clone_value;
   registry_info->signature=MagickCoreSignature;
   if (registry_semaphore == (SemaphoreInfo *) NULL)