From 4f7e1a56ef9cce166341b334491a686c2eab46e8 Mon Sep 17 00:00:00 2001
From: Tanguy Maze <tmaze@student.42.fr>
Date: Thu, 23 Jan 2020 00:25:58 +0100
Subject: [PATCH] fixed out-of-memory access in extension

---
 Makefile                |  4 ++--
 libft/srcs/ft_strtrim.c |  4 ++--
 srcs/ms_ext.c           | 40 ++++++++++++++++++++--------------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 4d168e9..085c7e1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2019/03/27 16:51:02 by tmaze             #+#    #+#              #
-#    Updated: 2019/12/06 09:59:47 by tmaze            ###   ########.fr        #
+#    Updated: 2020/01/22 17:50:24 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
@@ -27,7 +27,7 @@ endif
 
 #	Compilator
 CC		=	gcc
-FLAGS	=	-Wall -Wextra -Werror -g
+FLAGS	=	-Wall -Wextra -Werror -g -fsanitize=address
 
 #	Folders
 LIBDIR	=	libft
diff --git a/libft/srcs/ft_strtrim.c b/libft/srcs/ft_strtrim.c
index a750d22..b8cd8b0 100644
--- a/libft/srcs/ft_strtrim.c
+++ b/libft/srcs/ft_strtrim.c
@@ -1,4 +1,4 @@
-cf/* ************************************************************************** */
+/* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
 /*   ft_strtrim.c                                       :+:      :+:    :+:   */
@@ -6,7 +6,7 @@ cf/* **************************************************************************
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/04/07 17:00:34 by tmaze             #+#    #+#             */
-/*   Updated: 2019/12/09 13:00:48 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/22 17:51:11 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/srcs/ms_ext.c b/srcs/ms_ext.c
index 976aa38..76b13c0 100644
--- a/srcs/ms_ext.c
+++ b/srcs/ms_ext.c
@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/10/25 18:21:47 by tmaze             #+#    #+#             */
-/*   Updated: 2019/11/18 09:35:44 by tmaze            ###   ########.fr       */
+/*   Updated: 2020/01/23 00:23:24 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -54,29 +54,29 @@ char	*replace_env(char *src, t_env *elem, int key_size, int i)
 	res_len = ft_strlen(src) - key_size + ft_strlen(elem->val);
 	if ((ret = ft_strnew(res_len)) != NULL)
 	{
-		ft_strncpy(ret, src, i);
-		ft_strcat(ret, elem->val);
-		ft_strcat(ret, src + 1 + key_size);
+		ft_strlcpy(ret, src, i + 1);
+		ft_strlcat(ret, elem->val, res_len + 1);
+		ft_strlcat(ret, src + 1 + key_size, res_len + 1);
 	}
 	else
 		ft_printf("minishell: memory error\n");
 	return (ret);
 }
 
-char	*resolve_complete_key(char *src, int *index, t_env *env)
+char	*resolve_complete_key(char **src, int *index, t_env *env)
 {
 	t_env	*tmp;
 	char	*ret;
 
-	if ((tmp = search_key(env, src, *index + 1)) != NULL)
+	if ((tmp = search_key(env, *src, *index + 1)) != NULL)
 	{
-		if ((ret = replace_env(src, tmp, ft_strlen(tmp->key)
+		if ((ret = replace_env(*src, tmp, ft_strlen(tmp->key)
 			+ 1, *index)) != NULL)
 		{
-			ft_strdel(&src);
-			src = ret;
+			ft_strdel(src);
+			*src = ret;
 			*index += ft_strlen(tmp->val);
-			return (src);
+			return (*src);
 		}
 		else
 			return (return_null("minishell: memory error"));
@@ -87,27 +87,27 @@ char	*resolve_complete_key(char *src, int *index, t_env *env)
 
 char	**res_ext(char **av, t_env *env)
 {
-	int		i[3];
+	int		i[2];
 	t_env	*tmp;
 	char	*ret;
 
 	i[0] = 0;
-	while (av && av[i[0]])
+	while (av && av[i[0]] && !(i[1] = 0))
 	{
-		i[2] = 0;
-		while (av[i[0]] && av[i[0]][i[2]])
+		while (av[i[0]] && av[i[0]][i[1]])
 		{
-			if (av[i[0]][i[2]] == '~' && (tmp = ft_envgetelem("HOME", env))
-				!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[2])) != NULL)
+			if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
+				!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[1])) != NULL)
 			{
 				ft_strdel(&av[i[0]]);
 				av[i[0]] = ret;
-				i[2] += ft_strlen(tmp->val);
+				i[1] += ft_strlen(tmp->val);
 			}
-			else if (av[i[0]][i[2]] == '$'
-					&& resolve_complete_key(av[i[0]], &i[2], env) == NULL)
+			else if (av[i[0]][i[1]] == '$'
+				&& resolve_complete_key(&av[i[0]], &i[1], env) == NULL)
 				return (NULL);
-			i[2]++;
+			else if (av[i[0]][i[1]] != '$' && av[i[0]][i[1]] == '~')
+				i[1]++;
 		}
 		i[0]++;
 	}