aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-10-09 11:20:47 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-10-09 11:20:47 +0200
commit6b200dc03c8233f6cd49111540002eb9b5aac4ec (patch)
tree5834002464dfbf03ee0d9fd6faea05fa37f8397f
parent97e7e9b9934f99fbc659445512b19a525802726c (diff)
downloadminishell-6b200dc03c8233f6cd49111540002eb9b5aac4ec.tar.gz
minishell-6b200dc03c8233f6cd49111540002eb9b5aac4ec.tar.bz2
minishell-6b200dc03c8233f6cd49111540002eb9b5aac4ec.zip
Fixing 2 leaks in get_next_line and parser
m---------minishell_test0
-rw-r--r--src/main.c6
-rw-r--r--src/parser/parser.c5
-rw-r--r--src/path.c2
4 files changed, 9 insertions, 4 deletions
diff --git a/minishell_test b/minishell_test
-Subproject 5d1410a9b08eb8df82a43312b8b6d3d9c1c9eb0
+Subproject 84b23010e0d0515ad3ed17a605440e50439781e
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 <cacharle@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <nahaddac@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 */
/* */
/* ************************************************************************** */