From 13ecf634e7d6ebc75b9fd9003ff963b51bd47e26 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Thu, 23 Mar 2017 18:31:26 +0100 Subject: [PATCH] unset VAR leak fixed --- 42sh/libft/src/mem/ft_malloc.c | 4 ++-- 42sh/libft/src/sstr/ft_sstrdel.c | 4 ++-- 42sh/src/builtin/builtin_setenv.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/42sh/libft/src/mem/ft_malloc.c b/42sh/libft/src/mem/ft_malloc.c index df1e8660..bb1b9b54 100644 --- a/42sh/libft/src/mem/ft_malloc.c +++ b/42sh/libft/src/mem/ft_malloc.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/21 15:45:00 by jhalford #+# #+# */ -/* Updated: 2017/03/23 18:25:12 by jhalford ### ########.fr */ +/* Updated: 2017/03/23 18:31:10 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,7 @@ void *ft_malloc(size_t size) ptr = malloc(size); if (!ptr) { - ft_putstrfd(strerror(errno), 2); + ft_putstr_fd(strerror(errno), 2); exit(errno); } return (ptr); diff --git a/42sh/libft/src/sstr/ft_sstrdel.c b/42sh/libft/src/sstr/ft_sstrdel.c index 5aa39d86..de2fd4c4 100644 --- a/42sh/libft/src/sstr/ft_sstrdel.c +++ b/42sh/libft/src/sstr/ft_sstrdel.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/03 18:04:07 by jhalford #+# #+# */ -/* Updated: 2017/03/23 18:18:07 by jhalford ### ########.fr */ +/* Updated: 2017/03/23 18:31:06 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,7 @@ void ft_sstrdel(char **sstr, int index) int i; i = index; - ft_strdel(sstr + index); + free(sstr[index]); while (sstr[i]) { sstr[i] = sstr[i + 1]; diff --git a/42sh/src/builtin/builtin_setenv.c b/42sh/src/builtin/builtin_setenv.c index f2d8e5f2..5dd2bd1f 100644 --- a/42sh/src/builtin/builtin_setenv.c +++ b/42sh/src/builtin/builtin_setenv.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 14:25:17 by jhalford #+# #+# */ -/* Updated: 2017/03/23 18:18:33 by jhalford ### ########.fr */ +/* Updated: 2017/03/23 18:26:59 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */