vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-mkimage.c (main): Postpone freeing arguments.output

Browse source 
until after its use in generate_image.
This commit is contained in:
Leif Lindholm 2013-01-20 23:16:34 +00:00 committed by Colin Watson
parent 6a0debbd91
commit c821711f69
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-01-20 Leif Lindholm <leif.lindholm@arm.com>
* util/grub-mkimage.c (main): Postpone freeing arguments.output
until after its use in generate_image.
2013-01-20 Colin Watson <cjwatson@ubuntu.com> 2013-01-20 Colin Watson <cjwatson@ubuntu.com>
* grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the * grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the

4
util/grub-mkimage.c
View file

@ -1905,7 +1905,6 @@ main (int argc, char *argv[])
if (! fp) if (! fp)
grub_util_error (_("cannot open `%s': %s"), arguments.output, grub_util_error (_("cannot open `%s': %s"), arguments.output,
strerror (errno)); strerror (errno));
free (arguments.output);
} }
if (!arguments.dir) if (!arguments.dir)
@ -1933,5 +1932,8 @@ main (int argc, char *argv[])
if (arguments.dir) if (arguments.dir)
free (arguments.dir); free (arguments.dir);
if (arguments.output)
free (arguments.output);
return 0; return 0;
} }