From 909b647caa79e7dd752f7daae08177ec74fb841a Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 24 Nov 2009 14:45:00 +0000
Subject: [PATCH]

---
 magick/locale.c | 11 ++++++-----
 magick/mac.c    |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/magick/locale.c b/magick/locale.c
index 3cfb15d67..30cfeeebc 100644
--- a/magick/locale.c
+++ b/magick/locale.c
@@ -736,6 +736,9 @@ static MagickBooleanType LoadLocaleList(const char *xml,const char *filename,
   const char
     *q;
 
+  FatalErrorHandler
+    fatal_handler;
+
   LocaleInfo
     *locale_info;
 
@@ -757,17 +760,14 @@ static MagickBooleanType LoadLocaleList(const char *xml,const char *filename,
       locale_list=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
         DestroyLocaleNode);
       if (locale_list == (SplayTreeInfo *) NULL)
-        {
-          ThrowFileException(exception,ResourceLimitError,
-            "MemoryAllocationFailed",filename);
-          return(MagickFalse);
-        }
+        return(MagickFalse);
     }
   status=MagickTrue;
   locale_info=(LocaleInfo *) NULL;
   *tag='\0';
   *message='\0';
   *keyword='\0';
+  fatal_handler=SetFatalErrorHandler((ErrorHandler) NULL);
   token=AcquireString(xml);
   for (q=(char *) xml; *q != '\0'; )
   {
@@ -952,6 +952,7 @@ static MagickBooleanType LoadLocaleList(const char *xml,const char *filename,
       continue;
   }
   token=(char *) RelinquishMagickMemory(token);
+  (void) SetFatalErrorHandler(fatal_handler);
   return(status);
 }
 
diff --git a/magick/mac.c b/magick/mac.c
index 984990717..ad219d937 100644
--- a/magick/mac.c
+++ b/magick/mac.c
@@ -554,7 +554,6 @@ MagickExport void MACErrorHandler(const ExceptionType error,const char *reason,
 %
 %    o description: Specifies any description to the reason.
 %
-%
 */
 static void MACFatalErrorHandler(const ExceptionType severity,
   const char *reason,const char *description)
-- 
2.40.0