diff options
Diffstat (limited to 'src/compiler/glsl/glsl_lexer.ll')
| -rw-r--r-- | src/compiler/glsl/glsl_lexer.ll | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll index 7c41455d985..56519bf92dc 100644 --- a/src/compiler/glsl/glsl_lexer.ll +++ b/src/compiler/glsl/glsl_lexer.ll @@ -81,8 +81,13 @@ static int classify_identifier(struct _mesa_glsl_parse_state *, const char *); "illegal use of reserved word `%s'", yytext); \ return ERROR_TOK; \ } else { \ - void *mem_ctx = yyextra->linalloc; \ - yylval->identifier = linear_strdup(mem_ctx, yytext); \ + /* We're not doing linear_strdup here, to avoid an implicit \ + * call on strlen() for the length of the string, as this is \ + * already found by flex and stored in yyleng */ \ + void *mem_ctx = yyextra->linalloc; \ + char *id = (char *) linear_alloc_child(mem_ctx, yyleng + 1); \ + memcpy(id, yytext, yyleng + 1); \ + yylval->identifier = id; \ return classify_identifier(yyextra, yytext); \ } \ } while (0) @@ -261,8 +266,14 @@ HASH ^{SPC}#{SPC} <PP>[ \t\r]* { } <PP>: return COLON; <PP>[_a-zA-Z][_a-zA-Z0-9]* { - void *mem_ctx = yyextra->linalloc; - yylval->identifier = linear_strdup(mem_ctx, yytext); + /* We're not doing linear_strdup here, to avoid an implicit call + * on strlen() for the length of the string, as this is already + * found by flex and stored in yyleng + */ + void *mem_ctx = yyextra->linalloc; + char *id = (char *) linear_alloc_child(mem_ctx, yyleng + 1); + memcpy(id, yytext, yyleng + 1); + yylval->identifier = id; return IDENTIFIER; } <PP>[1-9][0-9]* { @@ -449,8 +460,14 @@ layout { || yyextra->ARB_tessellation_shader_enable) { return LAYOUT_TOK; } else { - void *mem_ctx = yyextra->linalloc; - yylval->identifier = linear_strdup(mem_ctx, yytext); + /* We're not doing linear_strdup here, to avoid an implicit call + * on strlen() for the length of the string, as this is already + * found by flex and stored in yyleng + */ + void *mem_ctx = yyextra->linalloc; + char *id = (char *) linear_alloc_child(mem_ctx, yyleng + 1); + memcpy(id, yytext, yyleng + 1); + yylval->identifier = id; return classify_identifier(yyextra, yytext); } } @@ -621,12 +638,18 @@ u64vec4 KEYWORD_WITH_ALT(0, 0, 0, 0, yyextra->ARB_gpu_shader_int64_enable, U64V [_a-zA-Z][_a-zA-Z0-9]* { struct _mesa_glsl_parse_state *state = yyextra; void *ctx = state->linalloc; - if (state->es_shader && strlen(yytext) > 1024) { + if (state->es_shader && yyleng > 1024) { _mesa_glsl_error(yylloc, state, "Identifier `%s' exceeds 1024 characters", yytext); } else { - yylval->identifier = linear_strdup(ctx, yytext); + /* We're not doing linear_strdup here, to avoid an implicit call + * on strlen() for the length of the string, as this is already + * found by flex and stored in yyleng + */ + char *id = (char *) linear_alloc_child(ctx, yyleng + 1); + memcpy(id, yytext, yyleng + 1); + yylval->identifier = id; } return classify_identifier(state, yytext); } |