From: Cristy Date: Sun, 25 Dec 2016 15:47:46 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.4-1~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f895ba2e12fb236c47ed1437d3d26830e965ef0f;p=imagemagick ... --- diff --git a/MagickWand/animate.c b/MagickWand/animate.c index 4b64c342a..296e866bc 100644 --- a/MagickWand/animate.c +++ b/MagickWand/animate.c @@ -461,10 +461,11 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info, i++; if (i == (ssize_t) argc) ThrowAnimateException(OptionError,"MissingArgument",option); - type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]); + type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse, + argv[i]); if (type < 0) - ThrowAnimateException(OptionError,"UnrecognizedAlphaChannelOption", - argv[i]); + ThrowAnimateException(OptionError, + "UnrecognizedAlphaChannelOption",argv[i]); break; } if (LocaleCompare("alpha-color",option+1) == 0) diff --git a/MagickWand/operation.c b/MagickWand/operation.c index e0b7548c1..e0f514b89 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -4742,8 +4742,9 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand, else new_images=ReadImages(_image_info,argv[i],_exception); AppendImageToList(&_images, new_images); + argv[i]=DestroyString(argv[i]); } - argv=DestroyStringList(argv); /* Destroy the Expanded Filename list */ + argv=(char **) RelinquishMagickMemory(argv); break; } /*