Merge branch 'ImageMagick-6' of git.imagemagick.org:repos/ImageMagick into ImageMagick-6

Cristy · Cristy · commit 26a58b29406b · 2015-09-19T07:53:14.000-04:00
diff --git a/magick/option.c b/magick/option.c
@@ -2325,6 +2325,7 @@ MagickExport MagickBooleanType IsOptionMember(const char *option,
   if (option_list == (char **) NULL)
     return(MagickFalse);
   member=MagickFalse;
+  option_list[0]=DestroyString(option_list[0]);
   for (i=1; i < (ssize_t) number_options; i++)
   {
     if ((*option_list[i] == '!') &&

Original file line number	Diff line number	Diff line change
`@@ -2325,6 +2325,7 @@ MagickExport MagickBooleanType IsOptionMember(const char *option,`
`2325`	`2325`	`if (option_list == (char **) NULL)`
`2326`	`2326`	`return(MagickFalse);`
`2327`	`2327`	`member=MagickFalse;`
	`2328`	`+ option_list[0]=DestroyString(option_list[0]);`
`2328`	`2329`	`for (i=1; i < (ssize_t) number_options; i++)`
`2329`	`2330`	`{`
`2330`	`2331`	`if ((*option_list[i] == '!') &&`