tvdu29/minishell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed out-of-memory access in extension

Browse Source
This commit is contained in:
Tanguy Maze 2020-01-23 00:25:58 +01:00
parent 8a421600f4
commit 4f7e1a56ef
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,7 +6,7 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ # # By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2019/03/27 16:51:02 by tmaze #+# #+# # # 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 # Compilator
CC = gcc CC = gcc
FLAGS = -Wall -Wextra -Werror -g FLAGS = -Wall -Wextra -Werror -g -fsanitize=address
# Folders # Folders
LIBDIR = libft LIBDIR = libft

4
libft/srcs/ft_strtrim.c
View File

@ -1,4 +1,4 @@
cf/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* ft_strtrim.c :+: :+: :+: */ /* ft_strtrim.c :+: :+: :+: */
@ -6,7 +6,7 @@ cf/* **************************************************************************
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2018/04/07 17:00:34 by tmaze #+# #+# */ /* 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

40
srcs/ms_ext.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/25 18:21:47 by tmaze #+# #+# */ /* 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); res_len = ft_strlen(src) - key_size + ft_strlen(elem->val);
if ((ret = ft_strnew(res_len)) != NULL) if ((ret = ft_strnew(res_len)) != NULL)
{ {
ft_strncpy(ret, src, i); ft_strlcpy(ret, src, i + 1);
ft_strcat(ret, elem->val); ft_strlcat(ret, elem->val, res_len + 1);
ft_strcat(ret, src + 1 + key_size); ft_strlcat(ret, src + 1 + key_size, res_len + 1);
} }
else else
ft_printf("minishell: memory error\n"); ft_printf("minishell: memory error\n");
return (ret); 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; t_env *tmp;
char *ret; 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) + 1, *index)) != NULL)
{ {
ft_strdel(&src); ft_strdel(src);
src = ret; *src = ret;
*index += ft_strlen(tmp->val); *index += ft_strlen(tmp->val);
return (src); return (*src);
} }
else else
return (return_null("minishell: memory error")); 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) char **res_ext(char **av, t_env *env)
{ {
int i[3]; int i[2];
t_env *tmp; t_env *tmp;
char *ret; char *ret;
i[0] = 0; 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[1]])
while (av[i[0]] && av[i[0]][i[2]])
{ {
if (av[i[0]][i[2]] == '~' && (tmp = ft_envgetelem("HOME", env)) if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[2])) != NULL) != NULL && (ret = replace_env(av[i[0]], tmp, 1, i[1])) != NULL)
{ {
ft_strdel(&av[i[0]]); ft_strdel(&av[i[0]]);
av[i[0]] = ret; av[i[0]] = ret;
i[2] += ft_strlen(tmp->val); i[1] += ft_strlen(tmp->val);
} }
else if (av[i[0]][i[2]] == '$' else if (av[i[0]][i[1]] == '$'
&& resolve_complete_key(av[i[0]], &i[2], env) == NULL) && resolve_complete_key(&av[i[0]], &i[1], env) == NULL)
return (NULL); return (NULL);
i[2]++; else if (av[i[0]][i[1]] != '$' && av[i[0]][i[1]] == '~')
i[1]++;
} }
i[0]++; i[0]++;
} }