From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 13 Dec 2012 14:56:15 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4609
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ed60113be5405e10ba8d3b5baafe8bc35c8b09d;p=imagemagick

---

diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index 81be7a108..990c89433 100644
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -124,6 +124,7 @@ MagickExport CacheView *AcquireAuthenticCacheView(const Image *image)
   if (status == MagickFalse)
     {
       CatchException(exception);
+      MagickCoreTerminus();
       _exit(1);
     }
   exception=DestroyExceptionInfo(exception);
diff --git a/MagickCore/exception-private.h b/MagickCore/exception-private.h
index 3e1d87cdb..53d4ddabe 100644
--- a/MagickCore/exception-private.h
+++ b/MagickCore/exception-private.h
@@ -23,6 +23,7 @@ extern "C" {
 #endif
 
 #include "MagickCore/log.h"
+#include "MagickCore/magick.h"
 #include "MagickCore/string_.h"
 
 #define ThrowBinaryException(severity,tag,context) \
@@ -47,6 +48,7 @@ extern "C" {
   message=DestroyString(message); \
   CatchException(&exception); \
   (void) DestroyExceptionInfo(&exception); \
+  MagickCoreTerminus(); \
   _exit(1); \
 }
 #define ThrowFileException(exception,severity,tag,context) \
diff --git a/coders/msl.c b/coders/msl.c
index bec7f21e3..09a7eb79b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1955,8 +1955,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                       if (composite_image->alpha_trait == UndefinedPixelTrait)
                         (void) SetImageAlpha(composite_image,OpaqueAlpha,
                           &exception);
-                      composite_view=AcquireAuthenticCacheView(composite_image,
-                        &exception);
+                      composite_view=AcquireAuthenticCacheView(composite_image);
                       for (y=0; y < (ssize_t) composite_image->rows ; y++)
                       {
                         q=GetCacheViewAuthenticPixels(composite_view,0,y,