]> granicus.if.org Git - imagemagick/commitdiff
Fixed memory leak that occurs when malloc fails.
authordirk <dirk@git.imagemagick.org>
Sun, 20 Sep 2015 07:11:28 +0000 (09:11 +0200)
committerdirk <dirk@git.imagemagick.org>
Sun, 20 Sep 2015 07:11:28 +0000 (09:11 +0200)
MagickCore/utility.c

index 6ab68b04ee3b79a251f80bc0daeb8ad967afb3c1..ae4f11de925507def493fd62518ce73bf87d25f2 100644 (file)
@@ -858,7 +858,12 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
     vector=(char **) ResizeQuantumMemory(vector,(size_t) *number_arguments+
       count+number_files+1,sizeof(*vector));
     if (vector == (char **) NULL)
-      return(MagickFalse);
+      {
+        for (j=0; j < (ssize_t) number_files; j++)
+          filelist[j]=DestroyString(filelist[j]);
+        filelist=(char **) RelinquishMagickMemory(filelist);
+        return(MagickFalse);
+      }
     for (j=0; j < (ssize_t) number_files; j++)
     {
       option=filelist[j];