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

2009-06-17 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
Fix newline handling

	* include/grub/script_sh.h (grub_lexer_param): new field was_newline
	* script/sh/lexer.c (grub_script_lexer_init): initilaise was_newline
	(grub_script_yylex): don't segfault on unterminated script
	newline terminates command and variable
This commit is contained in:
phcoder 2009-06-17 13:47:37 +00:00
parent 74aa8e4bf8
commit cf24ed9e2a
3 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2009-06-17 Vladimir Serbinenko <phcoder@gmail.com>
Fix newline handling
* include/grub/script_sh.h (grub_lexer_param): new field was_newline
* script/sh/lexer.c (grub_script_lexer_init): initilaise was_newline
(grub_script_yylex): don't segfault on unterminated script
newline terminates command and variable
2009-06-17 Vladimir Serbinenko <phcoder@gmail.com> 2009-06-17 Vladimir Serbinenko <phcoder@gmail.com>
avoid double grub_adjust_range call. Bug reported by David Simner avoid double grub_adjust_range call. Bug reported by David Simner

3
include/grub/script_sh.h
View file

@ -159,6 +159,9 @@ struct grub_lexer_param
/* The token that is already parsed but not yet returned. */ /* The token that is already parsed but not yet returned. */
int tokenonhold; int tokenonhold;
/* Was the last token a newline? */
int was_newline;
}; };
/* State of the parser as passes to the parser. */ /* State of the parser as passes to the parser. */

27
script/sh/lexer.c
View file

@ -64,6 +64,7 @@ grub_script_lexer_init (char *script, grub_reader_getline_t getline)
param->recordpos = 0; param->recordpos = 0;
param->recordlen = 0; param->recordlen = 0;
param->tokenonhold = 0; param->tokenonhold = 0;
param->was_newline = 0;
return param; return param;
} }
@ -158,8 +159,7 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
for (;! state->done; firstrun = 0) for (;! state->done; firstrun = 0)
{ {
if (! state->script || ! *state->script)
if (! *state->script)
{ {
/* Check if more tokens are requested by the parser. */ /* Check if more tokens are requested by the parser. */
if (((state->refs && ! parsestate->err) if (((state->refs && ! parsestate->err)
@ -169,7 +169,16 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
&& state->getline) && state->getline)
{ {
int doexit = 0; int doexit = 0;
while (!state->script || ! *state->script) if (state->state != GRUB_PARSER_STATE_ESC
&& state->state != GRUB_PARSER_STATE_QUOTE
&& state->state != GRUB_PARSER_STATE_DQUOTE
&& ! state->was_newline)
{
state->was_newline = 1;
state->tokenonhold = '\n';
break;
}
while (! state->script || ! *state->script)
{ {
grub_free (state->newscript); grub_free (state->newscript);
state->newscript = 0; state->newscript = 0;
@ -185,13 +194,10 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
break; break;
grub_dprintf ("scripting", "token=`\\n'\n"); grub_dprintf ("scripting", "token=`\\n'\n");
recordchar (state, '\n'); recordchar (state, '\n');
if (state->state != GRUB_PARSER_STATE_ESC if (state->state == GRUB_PARSER_STATE_VARNAME)
&& state->state != GRUB_PARSER_STATE_DQUOTE state->state = GRUB_PARSER_STATE_TEXT;
&& state->state != GRUB_PARSER_STATE_QUOTE) if (state->state == GRUB_PARSER_STATE_QVARNAME)
{ state->state = GRUB_PARSER_STATE_DQUOTE;
state->tokenonhold = '\n';
break;
}
if (state->state == GRUB_PARSER_STATE_DQUOTE if (state->state == GRUB_PARSER_STATE_DQUOTE
|| state->state == GRUB_PARSER_STATE_QUOTE) || state->state == GRUB_PARSER_STATE_QUOTE)
yylval->arg = grub_script_arg_add (parsestate, yylval->arg, yylval->arg = grub_script_arg_add (parsestate, yylval->arg,
@ -208,6 +214,7 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
break; break;
} }
} }
state->was_newline = 0;
newstate = grub_parser_cmdline_state (state->state, *state->script, &use); newstate = grub_parser_cmdline_state (state->state, *state->script, &use);