logistic-bot/minishell
1
0
Fork 0
mirror of https://codeberg.org/la-chouette/minishell.git synced 2025-12-06 07:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(parsing/simple_cmd): leak when invalid redirection after word in simple_cmd

Browse source
This commit is contained in:
Khaïs COLIN 2025-04-16 18:19:03 +02:00
parent 49a897b44e
commit 3be2969946
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/parser/simple_cmd/simple_cmd_parse.c
View file

@ -6,7 +6,7 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */ /* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/15 10:38:47 by khais #+# #+# */ /* Created: 2025/04/15 10:38:47 by khais #+# #+# */
/* Updated: 2025/04/16 15:26:54 by khais ### ########.fr */ /* Updated: 2025/04/16 18:20:39 by khais ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,10 +17,9 @@
#include "../cmd/cmd_destroy.h" #include "../cmd/cmd_destroy.h"
#include "../cmd_parsing.h" #include "../cmd_parsing.h"
t_cmd *minishell_simple_cmd_parse(t_minishell *app, t_wordlist **tokens) static t_cmd *simple_cmd_create(void)
{ {
t_cmd *simple; t_cmd *simple;
t_redirect *redir;
simple = cmd_create(FT_SIMPLE); simple = cmd_create(FT_SIMPLE);
if (simple == NULL) if (simple == NULL)
@ -28,6 +27,17 @@ t_cmd *minishell_simple_cmd_parse(t_minishell *app, t_wordlist **tokens)
simple->value.simple = ft_calloc(1, sizeof(t_simple_cmd)); simple->value.simple = ft_calloc(1, sizeof(t_simple_cmd));
if (simple->value.simple == NULL) if (simple->value.simple == NULL)
return (ft_errno(FT_ENOMEM), free(simple), NULL); return (ft_errno(FT_ENOMEM), free(simple), NULL);
return (simple);
}
t_cmd *minishell_simple_cmd_parse(t_minishell *app, t_wordlist **tokens)
{
t_cmd *simple;
t_redirect *redir;
simple = simple_cmd_create();
if (simple == NULL)
return (NULL);
redir = minishell_redirect_parse(app, tokens); redir = minishell_redirect_parse(app, tokens);
t_redirect_add_back(&simple->value.simple->redirections, redir); t_redirect_add_back(&simple->value.simple->redirections, redir);
if (ft_errno_get() != FT_ESUCCESS) if (ft_errno_get() != FT_ESUCCESS)
@ -39,6 +49,8 @@ t_cmd *minishell_simple_cmd_parse(t_minishell *app, t_wordlist **tokens)
if (!simple->value.simple->words) if (!simple->value.simple->words)
return (ft_errno(FT_EERRNO), cmd_destroy(simple), NULL); return (ft_errno(FT_EERRNO), cmd_destroy(simple), NULL);
redir = minishell_redirect_parse(app, tokens); redir = minishell_redirect_parse(app, tokens);
if (redir == NULL && ft_errno_get() != FT_ESUCCESS)
return (cmd_destroy(simple), ft_errno(FT_EERRNO), NULL);
t_redirect_add_back(&simple->value.simple->redirections, redir); t_redirect_add_back(&simple->value.simple->redirections, redir);
} }
if (!simple->value.simple->words) if (!simple->value.simple->words)

7
test.sh
View file

@ -681,4 +681,11 @@ expecting <<EOF
\$9HOME \$9HOME
EOF EOF
when_run <<EOF "invalid redirection in echo"
echo < >
EOF
expecting <<"EOF"
minishell: syntax error near unexpected token `>'
EOF
finalize finalize