removed arbitrary limit on token size
This commit is contained in:
BVK Chaitanya
parent
547e494f1b
commit
df6dc2113a
3 changed files with 89 additions and 81 deletions
|
|
@ -157,8 +157,10 @@ struct grub_lexer_param
|
|||
int merge_start;
|
||||
int merge_end;
|
||||
|
||||
/* Text of current token. */
|
||||
/* Part of a multi-part token. */
|
||||
char *text;
|
||||
unsigned used;
|
||||
unsigned size;
|
||||
|
||||
/* Type of text. */
|
||||
grub_script_arg_type_t type;
|
||||
|
|
@ -168,12 +170,9 @@ struct grub_lexer_param
|
|||
|
||||
/* Flex scanner buffer. */
|
||||
void *buffer;
|
||||
|
||||
/* Length of current token text. */
|
||||
unsigned size;
|
||||
};
|
||||
|
||||
#define GRUB_LEXER_TOKEN_MAX 256
|
||||
#define GRUB_LEXER_INITIAL_TEXT_SIZE 32
|
||||
#define GRUB_LEXER_RECORD_INCREMENT 256
|
||||
|
||||
/* State of the parser as passes to the parser. */
|
||||
|
|
|
|||
|
|
@ -213,7 +213,8 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
|
|||
if (!lexerstate)
|
||||
return 0;
|
||||
|
||||
lexerstate->text = grub_malloc (GRUB_LEXER_TOKEN_MAX);
|
||||
lexerstate->size = GRUB_LEXER_INITIAL_TEXT_SIZE;
|
||||
lexerstate->text = grub_malloc (lexerstate->size);
|
||||
if (!lexerstate->text)
|
||||
{
|
||||
grub_free (lexerstate);
|
||||
|
|
@ -301,7 +302,7 @@ grub_script_yylex (union YYSTYPE *value,
|
|||
do
|
||||
{
|
||||
/* Empty lexerstate->text. */
|
||||
lexerstate->size = 0;
|
||||
lexerstate->used = 1;
|
||||
lexerstate->text[0] = '\0';
|
||||
|
||||
token = yylex (value, lexerstate->yyscanner);
|
||||
|
|
@ -311,7 +312,6 @@ grub_script_yylex (union YYSTYPE *value,
|
|||
/* Merging feature uses lexerstate->text instead of yytext. */
|
||||
if (lexerstate->merge_start)
|
||||
{
|
||||
lexerstate->text[lexerstate->size] = '\0';
|
||||
str = lexerstate->text;
|
||||
type = lexerstate->type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,23 +37,11 @@
|
|||
grub_printf ("fatal error: %s\n", msg); \
|
||||
} while (0)
|
||||
|
||||
#define PUSH(c) \
|
||||
#define COPY(str, hint) \
|
||||
do { \
|
||||
if (yyextra->lexerstate->size >= GRUB_LEXER_TOKEN_MAX - 1) \
|
||||
grub_script_yyerror (yyextra, "token too long"); \
|
||||
else \
|
||||
yyextra->lexerstate->text[yyextra->lexerstate->size++] = c; \
|
||||
copy_string (yyextra, str, hint); \
|
||||
} while (0)
|
||||
|
||||
#define COPY(str) \
|
||||
do { \
|
||||
char *ptr = str; \
|
||||
while (*ptr && ! yyextra->err) \
|
||||
{ \
|
||||
PUSH (*ptr); \
|
||||
ptr++; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define RECORD \
|
||||
do { \
|
||||
|
|
@ -73,6 +61,8 @@
|
|||
static void grub_lexer_yyfree (void *, yyscan_t yyscanner);
|
||||
static void* grub_lexer_yyalloc (yy_size_t, yyscan_t yyscanner);
|
||||
static void* grub_lexer_yyrealloc (void*, yy_size_t, yyscan_t yyscanner);
|
||||
static void copy_string (struct grub_parser_param *, const char *,
|
||||
unsigned hint);
|
||||
|
||||
%}
|
||||
|
||||
|
|
@ -223,7 +213,7 @@ WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
|
|||
/* Split word into multiple args */
|
||||
|
||||
<SPLIT>{
|
||||
\\. { PUSH (yytext[1]); }
|
||||
\\. { COPY (yytext + 1, yyleng - 1); }
|
||||
\" {
|
||||
yy_push_state (DQUOTE, yyscanner);
|
||||
ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
|
||||
|
|
@ -236,13 +226,8 @@ WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
|
|||
yy_push_state (VAR, yyscanner);
|
||||
ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
|
||||
}
|
||||
{CHAR} { PUSH (yytext[0]); }
|
||||
.|\n {
|
||||
/* This cannot happen. */
|
||||
grub_script_yyerror (yyextra, "internal error: unexpected characters in a word");
|
||||
return GRUB_PARSER_TOKEN_BAD;
|
||||
}
|
||||
|
||||
\\ |
|
||||
[^\"\'$\\]+ { COPY (yytext, yyleng); }
|
||||
<<EOF>> {
|
||||
yy_pop_state (yyscanner);
|
||||
yypop_buffer_state (yyscanner);
|
||||
|
|
@ -255,7 +240,7 @@ WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
|
|||
\? |
|
||||
{DIGITS} |
|
||||
{NAME} {
|
||||
COPY (yytext);
|
||||
COPY (yytext, yyleng);
|
||||
yy_pop_state (yyscanner);
|
||||
if (YY_START == SPLIT)
|
||||
ARG (GRUB_SCRIPT_ARG_TYPE_VAR);
|
||||
|
|
@ -266,7 +251,7 @@ WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
|
|||
\{{DIGITS}\} |
|
||||
\{{NAME}\} {
|
||||
yytext[yyleng - 1] = '\0';
|
||||
COPY (yytext + 1);
|
||||
COPY (yytext + 1, yyleng - 2);
|
||||
yy_pop_state (yyscanner);
|
||||
if (YY_START == SPLIT)
|
||||
ARG (GRUB_SCRIPT_ARG_TYPE_VAR);
|
||||
|
|
@ -281,7 +266,7 @@ WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
|
|||
yy_pop_state (yyscanner);
|
||||
ARG (GRUB_SCRIPT_ARG_TYPE_SQSTR);
|
||||
}
|
||||
(.|\n) { PUSH (yytext[0]); }
|
||||
[^\']+ { COPY (yytext, yyleng); }
|
||||
}
|
||||
|
||||
<DQUOTE>{
|
||||
|
|
@ -293,10 +278,11 @@ WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
|
|||
yy_push_state (VAR, yyscanner);
|
||||
ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
|
||||
}
|
||||
\\\\ { PUSH ('\\'); }
|
||||
\\\" { PUSH ('\"'); }
|
||||
\\\\ { COPY ("\\", 1); }
|
||||
\\\" { COPY ("\"", 1); }
|
||||
\\\n { /* ignore */ }
|
||||
(.|\n) { PUSH (yytext[0]); }
|
||||
[^\"$\\\n]+ { COPY (yytext, yyleng); }
|
||||
(.|\n) { COPY (yytext, yyleng); }
|
||||
}
|
||||
|
||||
<<EOF>> {
|
||||
|
|
@ -329,3 +315,26 @@ grub_lexer_yyrealloc (void *ptr, yy_size_t size,
|
|||
return grub_realloc (ptr, size);
|
||||
}
|
||||
|
||||
static void copy_string (struct grub_parser_param *parser, const char *str, unsigned hint)
|
||||
{
|
||||
int len;
|
||||
int size;
|
||||
char *ptr;
|
||||
|
||||
len = hint ? hint : grub_strlen (str);
|
||||
if (parser->lexerstate->used + len >= parser->lexerstate->size)
|
||||
{
|
||||
size = parser->lexerstate->size * 2;
|
||||
ptr = grub_realloc (parser->lexerstate->text, size);
|
||||
if (!ptr)
|
||||
{
|
||||
grub_script_yyerror (parser, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
parser->lexerstate->text = ptr;
|
||||
parser->lexerstate->size = size;
|
||||
}
|
||||
grub_strcpy (parser->lexerstate->text + parser->lexerstate->used - 1, str);
|
||||
parser->lexerstate->used += len;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue