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

rescue_parser: restructure code to avoid Coverity false positive

Browse source 
If line contains single word, line and argv[0] are aliases, so
no NULL dereference is possible, but Coverity does not know it.
Change code to avoid ambiguity and also remove redundant call to
grub_strchr.

CID: 86725
This commit is contained in:
Andrei Borzenkov 2016-01-09 18:15:27 +03:00
parent 725548a285
commit bd60f5a207
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
grub-core/kern/rescue_parser.c
View file

@ -43,13 +43,17 @@ grub_rescue_parse_line (char *line,
/* In case of an assignment set the environment accordingly /* In case of an assignment set the environment accordingly
instead of calling a function. */ instead of calling a function. */
if (n == 1 && grub_strchr (line, '=')) if (n == 1)
{ {
char *val = grub_strchr (args[0], '='); char *val = grub_strchr (args[0], '=');
val[0] = 0;
grub_env_set (args[0], val + 1); if (val)
val[0] = '='; {
goto quit; val[0] = 0;
grub_env_set (args[0], val + 1);
val[0] = '=';
goto quit;
}
} }
/* Get the command name. */ /* Get the command name. */
@ -72,6 +76,7 @@ grub_rescue_parse_line (char *line,
} }
quit: quit:
/* Arguments are returned in single memory chunk separated by zeroes */
grub_free (args[0]); grub_free (args[0]);
grub_free (args); grub_free (args);