From 6b200dc03c8233f6cd49111540002eb9b5aac4ec Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Fri, 9 Oct 2020 11:20:47 +0200 Subject: Fixing 2 leaks in get_next_line and parser --- src/main.c | 6 ++++-- src/parser/parser.c | 5 ++++- src/path.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main.c b/src/main.c index c00c6ff..f484e91 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/28 11:45:44 by cacharle #+# #+# */ -/* Updated: 2020/10/08 11:36:46 by cacharle ### ########.fr */ +/* Updated: 2020/10/09 09:39:22 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -81,7 +81,9 @@ int repl(t_env env) return (2); g_child_pid = -1; print_prompt(); + free(line); } + free(line); if (ret != FTGL_EOF) return (2); return (0); @@ -101,7 +103,7 @@ int main(int argc, char **argv, char **envp) if ((env = env_from_array(envp)) == NULL) return (1); setup(argv[0], env); - /* g_state.child_pid = 0; */ + g_state.child_pid = -1; repl(env); ft_vecdestroy(env, free); return (g_state.last_status); diff --git a/src/parser/parser.c b/src/parser/parser.c index ce4501c..e861232 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/10/08 17:42:53 by cacharle ### ########.fr */ +/* Updated: 2020/10/09 11:10:55 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -154,6 +154,9 @@ t_parsed *parse_op(t_tok_lst *input) sep_tag = input->tag; if (!(sep_tag & TAG_IS_SEP)) { + ast_destroy(left->ast); + tok_lst_destroy(&left->rest, free); + free(left); return (parsed_error("syntax error near unexpected token `%s'", g_sep_str_lookup[sep_tag])); } diff --git a/src/path.c b/src/path.c index ac66b1e..40bf018 100644 --- a/src/path.c +++ b/src/path.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/27 15:51:01 by cacharle #+# #+# */ -/* Updated: 2020/10/09 09:15:09 by cacharle ### ########.fr */ +/* Updated: 2020/10/09 09:29:51 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -- cgit