From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 28 Jul 2012 12:57:17 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5236
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f661c4d04693ffdf83b5a8a300a9ac4a38a9c762;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 0ad7b8349..07c4c7ca4 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1,4 +1,4 @@
-/*
+  /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
 %                                                                             %
@@ -870,6 +870,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       resample_filter=DestroyResampleFilter(resample_filter);
       composite_view=DestroyCacheView(composite_view);
       destination_view=DestroyCacheView(destination_view);
+      composite_image=DestroyImage(composite_image);
       composite_image=destination_image;
       break;
     }
@@ -1044,6 +1045,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       destination_view=DestroyCacheView(destination_view);
       composite_view=DestroyCacheView(composite_view);
       image_view=DestroyCacheView(image_view);
+      composite_image=DestroyImage(composite_image);
       composite_image=destination_image;
       break;
     }
@@ -2303,7 +2305,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   image_view=DestroyCacheView(image_view);
   if (destination_image != (Image * ) NULL)
     destination_image=DestroyImage(destination_image);
-  composite_image=DestroyImage(composite_image);
+  else
+    composite_image=DestroyImage(composite_image);
   return(status);
 }