From c935f80dfe1fc466b865f2c8a01a5da3748a0f24 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Tue, 9 Jul 2024 16:19:19 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20No=20mo?= =?UTF-8?q?re=20leak=20in=20the=20parsing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/parsing/env_var/env_var_replace.c | 2 +- src/parsing/env_var/get_size_with_env.c | 4 ++-- src/parsing/get_redir_fd.c | 7 +++++-- src/parsing/split_cmd.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/parsing/env_var/env_var_replace.c b/src/parsing/env_var/env_var_replace.c index def4f7e..df1c779 100644 --- a/src/parsing/env_var/env_var_replace.c +++ b/src/parsing/env_var/env_var_replace.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/05 21:14:04 by adjoly #+# #+# */ -/* Updated: 2024/06/24 12:57:59 by adjoly ### ########.fr */ +/* Updated: 2024/07/09 16:12:34 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/parsing/env_var/get_size_with_env.c b/src/parsing/env_var/get_size_with_env.c index 327554b..5e146b2 100644 --- a/src/parsing/env_var/get_size_with_env.c +++ b/src/parsing/env_var/get_size_with_env.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/06 15:01:19 by adjoly #+# #+# */ -/* Updated: 2024/06/24 12:51:59 by adjoly ### ########.fr */ +/* Updated: 2024/07/09 15:09:44 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,5 +37,5 @@ size_t get_size_with_env(char *readline, t_env *env) } tmp++; } - return (size); + return (size + 1); } diff --git a/src/parsing/get_redir_fd.c b/src/parsing/get_redir_fd.c index 33530a9..7e6b8d7 100644 --- a/src/parsing/get_redir_fd.c +++ b/src/parsing/get_redir_fd.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/30 10:48:41 by adjoly #+# #+# */ -/* Updated: 2024/07/07 14:57:54 by adjoly ### ########.fr */ +/* Updated: 2024/07/09 16:16:27 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,6 +23,7 @@ t_cmd *get_redir_fd(void *content, t_env *env) t_list *tmp; t_redir_sign sign[2]; t_cmd *cmd; + char *env_varred; tmp = ((t_token *)content)->redirection; cmd = NULL; @@ -38,6 +39,8 @@ t_cmd *get_redir_fd(void *content, t_env *env) cmd->outfile = STDOUT_FILENO; if (sign[1] == OUTFILE) cmd->infile = STDIN_FILENO; - cmd = split_cmd(env_var_replace(((t_token *)content)->argv, env), cmd); + env_varred = env_var_replace(((t_token *)content)->argv, env); + cmd = split_cmd(env_varred, cmd); + free(env_varred); return (cmd); } diff --git a/src/parsing/split_cmd.c b/src/parsing/split_cmd.c index 88da6a1..549ef7c 100644 --- a/src/parsing/split_cmd.c +++ b/src/parsing/split_cmd.c @@ -6,7 +6,7 @@ /* By: mmoussou