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

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 07c4c7ca4..73683f5e8 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -689,6 +689,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       }
       composite_view=DestroyCacheView(composite_view);
       image_view=DestroyCacheView(image_view);
+      composite_image=DestroyImage(composite_image);
       return(status);
     }
     case CopyAlphaCompositeOp:
@@ -736,7 +737,10 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       destination_image=CloneImage(image,image->columns,image->rows,MagickTrue,
         exception);
       if (destination_image == (Image *) NULL)
-        return(MagickFalse);
+        {
+          composite_image=DestroyImage(composite_image);
+          return(MagickFalse);
+        }
       /*
         Gather the maximum blur sigma values from user.
       */
@@ -749,6 +753,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           (void) ThrowMagickException(exception,GetMagickModule(),
                OptionWarning,"InvalidSetting","'%s' '%s'",
                "compose:args",value);
+          composite_image=DestroyImage(composite_image);
           destination_image=DestroyImage(destination_image);
           return(MagickFalse);
         }
@@ -904,7 +909,10 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       destination_image=CloneImage(image,image->columns,image->rows,MagickTrue,
         exception);
       if (destination_image == (Image *) NULL)
-        return(MagickFalse);
+        {
+          composite_image=DestroyImage(composite_image);
+          return(MagickFalse);
+        }
       SetGeometryInfo(&geometry_info);
       flags=NoValue;
       value=GetImageArtifact(composite_image,"compose:args");