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

merge with mainline

Browse source
This commit is contained in:
BVK Chaitanya 2010-09-03 20:06:57 +05:30
commit 0dfb7ba053
176 changed files with 9708 additions and 5141 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/script/lexer.c
View file

@ -236,7 +236,7 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
script = script ? : "\n";
len = grub_strlen (script);
if (script[len - 1] == '\n')
if (len != 0 && script[len - 1] == '\n')
{
buffer = yy_scan_string (script, lexerstate->yyscanner);
}

6
grub-core/script/script.c
View file

@ -365,7 +365,10 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
parsestate = grub_zalloc (sizeof (*parsestate));
if (!parsestate)
return 0;
{
grub_free (parsed);
return 0;
}
/* Initialize the lexer. */
lexstate = grub_script_lexer_init (parsestate, script, getline);
@ -388,6 +391,7 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
grub_script_mem_free (memfree);
grub_script_lexer_fini (lexstate);
grub_free (parsestate);
grub_free (parsed);
return 0;
}