[Mesa-dev] [PATCH] glsl: Fix memory leak in glsl_lexer.ll
Juha-Pekka Heikkila
juhapekka.heikkila at gmail.com
Fri Sep 5 06:22:36 PDT 2014
Running fast clear glClear with SNB caused Valgrind to
complain about this.
v2: line 237 fixed glClear from leaking memory, other
strdups are also now changed to ralloc_strdups but I
don't know what effect those have. At least no changes in
my Piglit quick run.
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
---
src/glsl/glsl_lexer.ll | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index b7c4aad..9cf57dd 100644
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -81,7 +81,8 @@ static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);
"illegal use of reserved word `%s'", yytext); \
return ERROR_TOK; \
} else { \
- yylval->identifier = strdup(yytext); \
+ void *ctx = yyextra; \
+ yylval->identifier = ralloc_strdup(ctx, yytext); \
return classify_identifier(yyextra, yytext); \
} \
} while (0)
@@ -232,7 +233,8 @@ HASH ^{SPC}#{SPC}
<PP>[ \t\r]* { }
<PP>: return COLON;
<PP>[_a-zA-Z][_a-zA-Z0-9]* {
- yylval->identifier = strdup(yytext);
+ void *ctx = yyextra;
+ yylval->identifier = ralloc_strdup(ctx, yytext);
return IDENTIFIER;
}
<PP>[1-9][0-9]* {
@@ -409,7 +411,8 @@ layout {
|| yyextra->ARB_compute_shader_enable) {
return LAYOUT_TOK;
} else {
- yylval->identifier = strdup(yytext);
+ void *ctx = yyextra;
+ yylval->identifier = ralloc_strdup(ctx, yytext);
return classify_identifier(yyextra, yytext);
}
}
--
1.8.5.1
More information about the mesa-dev
mailing list