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

write overflow bug fix with cleanup

Browse source
This commit is contained in:
BVK Chaitanya 2010-05-21 15:34:36 +05:30
parent 868bebea0c
commit f532a574a6
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
script/argv.c
View file

@ -62,28 +62,18 @@ grub_script_argv_next (struct grub_script_argv *argv)
{ {
char **p = argv->args; char **p = argv->args;
if (argv->argc == 0) if (argv->args && argv->args[argv->argc - 1] == 0)
{
p = grub_malloc (2 * sizeof (char *));
if (! p)
return 1;
argv->argc = 1;
argv->args = p;
argv->args[0] = 0;
argv->args[1] = 0;
return 0;
}
if (! argv->args[argv->argc - 1])
return 0; return 0;
p = grub_realloc (p, round_up_exp ((argv->argc + 1) * sizeof (char *))); p = grub_realloc (p, round_up_exp ((argv->argc + 2) * sizeof (char *)));
if (! p) if (! p)
return 1; return 1;
argv->argc++; argv->argc++;
argv->args = p; argv->args = p;
if (argv->argc == 1)
argv->args[0] = 0;
argv->args[argv->argc] = 0; argv->args[argv->argc] = 0;
return 0; return 0;
} }