]> granicus.if.org Git - imagemagick/commitdiff
Removed unnecessary checks for NULL when calling NewSplayTree
authorDirk Lemstra <dirk@git.imagemagick.org>
Sun, 15 Oct 2017 08:16:20 +0000 (10:16 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Sun, 15 Oct 2017 08:16:20 +0000 (10:16 +0200)
MagickCore/coder.c
MagickCore/locale.c
MagickCore/magick.c
MagickCore/module.c
MagickCore/type.c

index 0eecfedf1bfb0bd94eb690fd481d0d20562c10a2..8590731eea3bcbaf37e909d3ace62ce40410a63a 100644 (file)
@@ -335,8 +335,6 @@ static SplayTreeInfo *AcquireCoderCache(const char *filename,
   */
   cache=NewSplayTree(CompareSplayTreeString,RelinquishMagickMemory,
     DestroyCoderNode);
-  if (cache == (SplayTreeInfo *) NULL)
-    ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   status=MagickTrue;
 #if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
   {
index 74cb084b99fd09d2c363d63d1196399ad7e115aa..6d2100e70e8caafe5403cf11872d8df3afdd424a 100644 (file)
@@ -194,8 +194,6 @@ static SplayTreeInfo *AcquireLocaleSplayTree(const char *filename,
 
   cache=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
     DestroyLocaleNode);
-  if (cache == (SplayTreeInfo *) NULL)
-    ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   status=MagickTrue;
 #if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
   {
index 0df76eace5e983b94a287d8e40492daab7be365a..ee85802d9c0fbf81671d99c23eced9bb984faf0c 100644 (file)
@@ -1022,9 +1022,6 @@ static MagickBooleanType IsMagickTreeInstantiated(ExceptionInfo *exception)
         {
           magick_list=NewSplayTree(CompareSplayTreeString,(void *(*)(void *))
             NULL,DestroyMagickNode);
-          if (magick_list == (SplayTreeInfo *) NULL)
-            ThrowFatalException(ResourceLimitFatalError,
-              "MemoryAllocationFailed");
 #if defined(MAGICKCORE_MODULES_SUPPORT)
           (void) GetModuleInfo((char *) NULL,exception);
 #endif
index 10ee4944166e18c4f21e769a90dfed91f731ee69..e1aeb8170d3866f72acfba6cce016e0c119362aa 100644 (file)
@@ -883,9 +883,6 @@ static MagickBooleanType IsModuleTreeInstantiated()
 
           splay_tree=NewSplayTree(CompareSplayTreeString,
             (void *(*)(void *)) NULL,DestroyModuleNode);
-          if (splay_tree == (SplayTreeInfo *) NULL)
-            ThrowFatalException(ResourceLimitFatalError,
-              "MemoryAllocationFailed");
           module_info=AcquireModuleInfo((const char *) NULL,"[boot-strap]");
           module_info->stealth=MagickTrue;
           status=AddValueToSplayTree(splay_tree,module_info->tag,module_info);
index 18ac7d80ac38c4e81d00fd319835b7270b549fe3..bb4e2e83974d4d3080eadec9bbd410c18aa4936f 100644 (file)
@@ -198,8 +198,6 @@ static SplayTreeInfo *AcquireTypeCache(const char *filename,
 
   cache=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
     DestroyTypeNode);
-  if (cache == (SplayTreeInfo *) NULL)
-    ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   status=MagickTrue;
 #if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
   {