OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: fix abuse of yylex

Browse Source 
So glcpp tried to workaround yylex its own way, but failed,
do it properly.

This fixes another crash found after fixing the first crash.

this is a candidate for 9.0 and stable branches

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2012-09-14 19:59:54 +10:00
parent cc943c8470
commit 53d46bc787
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/glcpp/Makefile.am
View File

@@ -31,7 +31,7 @@ AM_CFLAGS = \
$(LIBRARY_DEFINES) \ $(LIBRARY_DEFINES) \
$(API_DEFINES) $(API_DEFINES)
AM_YFLAGS = -v -d AM_YFLAGS = -v -d -p "glcpp_parser_"
AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
noinst_LTLIBRARIES = libglcpp.la noinst_LTLIBRARIES = libglcpp.la

8
src/glsl/glcpp/glcpp-parse.y
View File

@@ -133,8 +133,6 @@ _glcpp_parser_skip_stack_change_if (glcpp_parser_t *parser, YYLTYPE *loc,
static void static void
_glcpp_parser_skip_stack_pop (glcpp_parser_t *parser, YYLTYPE *loc); _glcpp_parser_skip_stack_pop (glcpp_parser_t *parser, YYLTYPE *loc);
#define yylex glcpp_parser_lex
static int static int
glcpp_parser_lex (YYSTYPE *yylval, YYLTYPE *yylloc, glcpp_parser_t *parser); glcpp_parser_lex (YYSTYPE *yylval, YYLTYPE *yylloc, glcpp_parser_t *parser);
@@ -1197,12 +1195,6 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
return parser; return parser;
} }
int
glcpp_parser_parse (glcpp_parser_t *parser)
{
return yyparse (parser);
}
void void
glcpp_parser_destroy (glcpp_parser_t *parser) glcpp_parser_destroy (glcpp_parser_t *parser)
{ {