(no commit message)

diff --git a/magick/locale.c b/magick/locale.c
index 3cfb15d67bbc073091869b003e58d58a2ffa5eb6..30cfeeebc3cb5280e550f75e19805f722f888872 100644 (file)
--- 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);
 }
 \f

diff --git a/magick/mac.c b/magick/mac.c
index 984990717a49bf3ef986b56857bc4ef6a352dacf..ad219d937c1c23cff7eed658617ed69b223d6a36 100644 (file)
--- 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)