darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-21 02:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

More error checking and proper unreferencing of ast nodes if expressions for computed goto fails.

Browse source
This commit is contained in:
Dale Weiler 2013-01-02 22:39:24 +00:00
parent c1734d1b27
commit a168c5efbe
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
parser.c
View file

@ -2981,15 +2981,10 @@ static ast_expression *parse_goto_computed(parser_t *parser, ast_expression *sid
on_true = parse_goto_computed(parser, ((ast_ternary*)side)->on_true);
on_false = parse_goto_computed(parser, ((ast_ternary*)side)->on_false);
if (!on_true) {
if (!on_true || !on_false) {
parseerror(parser, "expected label or expression in ternary");
ast_unref(((ast_ternary*)side)->on_false);
return NULL;
}
if (!on_false) {
parseerror(parser, "expected label or expression in ternary");
ast_unref(((ast_ternary*)side)->on_true);
if (((ast_ternary*)side)->on_false) ast_unref(((ast_ternary*)side)->on_false);
if (((ast_ternary*)side)->on_true) ast_unref(((ast_ternary*)side)->on_true);
return NULL;
}
@ -3012,6 +3007,7 @@ static bool parse_goto(parser_t *parser, ast_expression **out)
if (parser->tok != TOKEN_IDENT) {
ast_expression *expression;
/* could be an expression i.e computed goto :-) */
if (parser->tok != '(') {
parseerror(parser, "expected label name after `goto`");
@ -3022,6 +3018,7 @@ static bool parse_goto(parser_t *parser, ast_expression **out)
if (!(expression = parse_expression(parser, false)) ||
!(*out = parse_goto_computed(parser, expression))) {
parseerror(parser, "invalid goto expression");
ast_unref(expression);
return false;
}