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-04 08:33:42 +05:30
commit adcf5a8e30
179 changed files with 9781 additions and 5175 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -216,7 +216,6 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
grub_reader_getline_t getline)
{
int len;
char *script2;
YY_BUFFER_STATE buffer;
struct grub_lexer_param *lexerstate;
@ -239,6 +238,7 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
grub_free (lexerstate);
return 0;
}
yyset_extra (parser, lexerstate->yyscanner);
parser->lexerstate = lexerstate;

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;
}