eliminate lint warnings

ImageMagick · Jun 11, 2022 · ff3e1f5 · ff3e1f5
1 parent 8c6731a
commit ff3e1f5
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/MagickCore/registry.c b/MagickCore/registry.c
@@ -452,9 +452,6 @@ static void *DestroyRegistryNode(void *registry_info)
 MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
   const char *key,const void *value,ExceptionInfo *exception)
 {
-  MagickBooleanType
-    status;
-
   RegistryInfo
     *registry_info;
 
@@ -484,7 +481,8 @@ MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
         *image;
 
       image=(const Image *) value;
-      if (image->signature != MagickCoreSignature)
+      if ((image == (const Image *) NULL) ||
+          (image->signature != MagickCoreSignature))
         {
           (void) ThrowMagickException(exception,GetMagickModule(),RegistryError,
             "UnableToSetRegistry","%s",key);
@@ -499,7 +497,8 @@ MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
         *image_info;
 
       image_info=(const ImageInfo *) value;
-      if (image_info->signature != MagickCoreSignature)
+      if ((image_info == (const ImageInfo *) NULL) ||
+          (image_info->signature != MagickCoreSignature))
         {
           (void) ThrowMagickException(exception,GetMagickModule(),RegistryError,
             "UnableToSetRegistry","%s",key);
@@ -526,6 +525,5 @@ MagickExport MagickBooleanType SetImageRegistry(const RegistryType type,
           DestroyRegistryNode);
       UnlockSemaphoreInfo(registry_semaphore);
     }
-  status=AddValueToSplayTree(registry,ConstantString(key),registry_info);
-  return(status);
+  return(AddValueToSplayTree(registry,ConstantString(key),registry_info));
 }