diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-09-14 16:02:49 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-09-14 16:02:49 +0200 |
| commit | 6b2157c5e64cbf1a4ed4cd0b4de40bbeab535de7 (patch) | |
| tree | 2f3f7da9af5dac3e98dbc68fd20e19e2c192829d | |
| parent | 7afd22aacdae5d88f560576fd7261801beb60739 (diff) | |
| download | minishell-6b2157c5e64cbf1a4ed4cd0b4de40bbeab535de7.tar.gz minishell-6b2157c5e64cbf1a4ed4cd0b4de40bbeab535de7.tar.bz2 minishell-6b2157c5e64cbf1a4ed4cd0b4de40bbeab535de7.zip | |
Fixing status to string leak by putting the string representation in a static buffer
| m--------- | libft | 0 | ||||
| -rw-r--r-- | src/env.c | 6 | ||||
| -rw-r--r-- | src/eval/cmd.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/libft b/libft -Subproject 50876fe6b9e369d6b51bac9fa62b790ef5bda9d +Subproject 3133f0d4d640abd62287187d13d380d03cce00a @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/28 09:21:24 by cacharle #+# #+# */ -/* Updated: 2020/09/10 14:19:42 by charles ### ########.fr */ +/* Updated: 2020/09/14 16:00:15 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -91,6 +91,8 @@ int env_search_index(t_env env, char *key) return (-1); } +static char g_status_buf[64] = {'\0'}; + char *env_search_first_match(t_env env, const char *haystack) { size_t len; @@ -105,7 +107,7 @@ char *env_search_first_match(t_env env, const char *haystack) while (ft_isalnum(haystack[len]) || haystack[len] == '_') len++; if (haystack[0] == '?') - return (ft_itoa(g_last_status)); // FIXME leak (static buffer) + return (ft_itoa_cpy(g_status_buf, g_last_status)); if (len == 0) return (NULL); i = -1; diff --git a/src/eval/cmd.c b/src/eval/cmd.c index e1d844a..ff2c904 100644 --- a/src/eval/cmd.c +++ b/src/eval/cmd.c @@ -6,7 +6,7 @@ /* By: charles <charles@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/14 10:41:31 by charles #+# #+# */ -/* Updated: 2020/09/14 15:42:52 by charles ### ########.fr */ +/* Updated: 2020/09/14 15:50:15 by charles ### ########.fr */ /* */ /* ************************************************************************** */ |