]> granicus.if.org Git - imagemagick/commitdiff
Eliminate initialize file list
authorCristy <urban-warrior@imagemagick.org>
Sun, 21 Jan 2018 23:37:46 +0000 (18:37 -0500)
committerCristy <urban-warrior@imagemagick.org>
Sun, 21 Jan 2018 23:37:46 +0000 (18:37 -0500)
Credit OSS Fuzz

coders/vid.c

index 6493b4d8e3470c7406aa36cac3ae73ed1035ab84..57ad0e4d8bc5c05dd472ace37e52d0ba744dd766 100644 (file)
@@ -100,6 +100,7 @@ static Image *ReadVIDImage(const ImageInfo *image_info,ExceptionInfo *exception)
 #define ClientName  "montage"
 
   char
+    **list,
     **filelist,
     *label;
 
@@ -139,12 +140,15 @@ static Image *ReadVIDImage(const ImageInfo *image_info,ExceptionInfo *exception)
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
   image=AcquireImage(image_info,exception);
-  filelist=(char **) AcquireMagickMemory(sizeof(*filelist));
-  if (filelist == (char **) NULL)
+  list=(char **) AcquireMagickMemory(sizeof(*filelist));
+  if (list == (char **) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-  filelist[0]=ConstantString(image_info->filename);
+  list[0]=ConstantString(image_info->filename);
+  filelist=list;
   number_files=1;
   status=ExpandFilenames(&number_files,&filelist);
+  list[0]=DestroyString(list[0]);
+  list=(char **) RelinquishMagickMemory(list);
   if ((status == MagickFalse) || (number_files == 0))
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   image=DestroyImage(image);