From 6b2157c5e64cbf1a4ed4cd0b4de40bbeab535de7 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Mon, 14 Sep 2020 16:02:49 +0200 Subject: Fixing status to string leak by putting the string representation in a static buffer --- src/env.c | 6 ++++-- src/eval/cmd.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/env.c b/src/env.c index 19ead42..42339c8 100644 --- a/src/env.c +++ b/src/env.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ -- cgit