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

* util/grub-editenv.c (argp_parser): Don't pass translated strings

Browse source 
as printf format strings; the translations might contain '%' which
could cause a crash.
(main): Likewise.
* util/grub-fstest.c (argp_parser): Likewise.
* util/grub-setup.c (argp_parser): Likewise.
(main): Likewise.
This commit is contained in:
Colin Watson 2010-09-20 17:56:14 +01:00
parent 3286a4b4c2
commit dfe3b247a2
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/grub-fstest.c
View file

@ -394,12 +394,12 @@ argp_parser (int key, char *arg, struct argp_state *state)
num_disks = grub_strtoul (arg, NULL, 0);
if (num_disks < 1)
{
fprintf (stderr, _("Invalid disk count.\n"));
fprintf (stderr, "%s", _("Invalid disk count.\n"));
argp_usage (state);
}
if (args_count != 0)
{
fprintf (stderr, _("Disk count must precede disks list.\n"));
fprintf (stderr, "%s", _("Disk count must precede disks list.\n"));
argp_usage (state);
}
return 0;
@ -415,12 +415,12 @@ argp_parser (int key, char *arg, struct argp_state *state)
case ARGP_KEY_END:
if (args_count < num_disks)
{
fprintf (stderr, _("No command is specified.\n"));
fprintf (stderr, "%s", _("No command is specified.\n"));
argp_usage (state);
}
if (args_count - 1 - num_disks < nparm)
{
fprintf (stderr, _("Not enough parameters to command.\n"));
fprintf (stderr, "%s", _("Not enough parameters to command.\n"));
argp_usage (state);
}
return 0;
@ -436,7 +436,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
{
if (arg[0] != '/')
{
fprintf (stderr, _("Must use absolute path.\n"));
fprintf (stderr, "%s", _("Must use absolute path.\n"));
argp_usage (state);
}
if (args_count == 0)