From 46c7f91cdceef0d5dd801ac569fb5d0c76b711aa Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 16 Sep 2020 20:25:08 +0200 Subject: Fixing memory leaks in preprocess and parser --- src/parser/parser.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/parser') diff --git a/src/parser/parser.c b/src/parser/parser.c index 1a3de7f..ddbbc0b 100644 --- a/src/parser/parser.c +++ b/src/parser/parser.c @@ -6,7 +6,7 @@ /* By: nahaddac +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/17 18:09:04 by nahaddac #+# #+# */ -/* Updated: 2020/09/13 11:50:11 by charles ### ########.fr */ +/* Updated: 2020/09/16 20:19:05 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -83,7 +83,7 @@ t_parsed *parse_op(t_tok_lst *input) return (left); input = left->rest; if (input == NULL || input->tag & TAG_PARENT_CLOSE) - return (parsed_new(left->ast, input)); + return (left); sep_tag = input->tag; if (!(sep_tag & TAG_IS_SEP)) return (parsed_error("syntax error near unexpected token `%s'\n", input->content)); @@ -100,7 +100,10 @@ t_parsed *parse_op(t_tok_lst *input) ast->op.left = left->ast; ast->op.right = right->ast; ast->op.sep = sep_tag; - return (parsed_new(ast, right->rest)); + free(left); + left = parsed_new(ast, right->rest); + free(right); + return (left); } /* @@ -122,7 +125,8 @@ t_parsed *parse_expr(t_tok_lst *input) if (input == NULL || !(input->tag & TAG_PARENT_CLOSE)) return (parsed_error("syntax error expected token\n")); input = input->next; - ast = ast_new(AST_PARENT); + if ((ast = ast_new(AST_PARENT)) == NULL) + return (NULL); ast->parent_ast = parsed->ast; parsed->ast = ast; while (input != NULL && input->tag & TAG_IS_REDIR) -- cgit