fixed hash leak and all cd leaks

Author: 0x0M4R

Makefile

@@ -95,7 +95,7 @@ $(NAME): $(OBJECTS_PREFIXED) $(LIBFT)
 leak: #only use to check leak with valgrind
 	@echo "leak"
 	@make re
-	@valgrind --leak-check=full --tool=memcheck ./$(NAME)
+	@valgrind --leak-check=full --show-leak-kinds=all --suppressions=valgrind_filter.supp --tool=memcheck ./$(NAME)
 
 all: $(NAME)
 	@make all -C $(LIBDIR)

include/minishell.h

@@ -190,5 +190,7 @@ void			free_loop(t_minishell *msh);
 void			ft_free_hash(t_hash_table *table);
 void			ft_command_table_free(t_minishell *msh);
 bool			is_case_alph(char str);
+void			free_2d_array(char **array);
+void			ft_free_prompt(t_minishell *msh);
 
 #endif

src/main.c

@@ -48,7 +48,8 @@ bool	check_valid_line(char *str)
 static void	minishill_start(t_minishell *msh, char **env)
 {
 	msh->env_table = init_table(env);
-	msh->env = env2d(msh->env_table);
+	//print_hash(msh->env_table);
+	//printf("%s",msh->env[0]);
 	while (1)
 	{
 		read_line(msh);

src/tools/builtins/ft_exit.c

@@ -51,5 +51,7 @@ void	ft_exit(t_minishell *msh, int i)
 		exit(2);
 	}
 	ft_with_arg(msh, msh->cmd_table[i]->exec_table);
+	ft_free_prompt(msh);
+	ft_command_table_free(msh);
 	ft_free_minishell(msh);
 }

src/tools/exec/execute.c

@@ -52,7 +52,7 @@ void	execute(t_minishell *msh, int i)
 		}
 		else
 		{
-			execve(get_path(msh, i), msh->cmd_table[i]->exec_table, msh->env);
+			execve(get_path(msh, i), msh->cmd_table[i]->exec_table, NULL);
 			error_message(msh, "NOT FOUND", 127);
 			exit(127);
 		}		
@@ -76,8 +76,7 @@ void	init_execute(t_minishell *msh)
 	i = 0;
 	if (msh->command_count == 1)
 	{
-		if (!ft_strncmp(msh->cmd_table[i]->exec_table[0], "cd", 3) || \
-		!ft_strncmp(msh->cmd_table[i]->exec_table[0], "exit", 5))
+		if (msh->cmd_table[i]->command_type == BUILTIN)
 			execute_builtin(msh, i);
 		else
 			execute(msh, 0);

src/tools/hash/remove_hash.c

@@ -23,5 +23,5 @@ void	remove_hash(t_minishell *msh, char *key)
 		free(msh->env_table->table[i]->value);
 		msh->env_table->table[i] = NULL;
 	}
-	msh->env = env2d(msh->env_table);
+	//msh->env = env2d(msh->env_table);
 }

src/tools/hash/update_hash.c

@@ -41,6 +41,6 @@ void	update_hash(t_minishell *msh, char *key, char *value)
 		msh->env_table->table[i]->value = ft_strdup(value);
 		msh->env_table->count++;
 	}
-	free(msh->env);
-	msh->env = env2d(msh->env_table);
+	//free_2d_array(msh->env);
+	//msh->env = env2d(msh->env_table);
 }

src/tools/tokenizer/tokenizer_tools.c

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   tokenizer_tools.c                                  :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: oal-tena <oal-tena@student.42.fr>          +#+  +:+       +#+        */
+/*   By: Dokcer <Dokcer@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/06/22 04:59:25 by oal-tena          #+#    #+#             */
-/*   Updated: 2022/06/22 07:29:52 by oal-tena         ###   ########.fr       */
+/*   Updated: 2022/07/13 13:58:43 by Dokcer           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

src/utils/ft_free.c

@@ -6,7 +6,7 @@
 /*   By: Dokcer <[email protected]>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/04/24 12:39:16 by oal-tena          #+#    #+#             */
-/*   Updated: 2022/07/13 11:47:39 by Dokcer           ###   ########.fr       */
+/*   Updated: 2022/07/13 14:10:02 by Dokcer           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,20 +15,20 @@
 void	ft_free_hash(t_hash_table *table)
 {
 	unsigned int	i;
-	unsigned long	_hash;
 
 	i = 0;
-	while (table->table[i])
+	while (i < table->size)
 	{
-		_hash = hash(table->table[i]->key, table->size);
-		if (table->table[_hash])
+		if (table->table[i])
 		{
-			free(table->table[_hash]->key);
-			free(table->table[_hash]->value);
-			free(table->table[_hash]);
+			free(table->table[i]->key);
+			free(table->table[i]->value);
+			free(table->table[i]);
 		}
 		i++;
 	}
+	free(table->table);
+	free(table);
 }
 
 void	ft_free_prompt(t_minishell *msh)
@@ -42,8 +42,18 @@ void	free_2d_array(char **array)
 	int	i;
 
 	i = 0;
-	while (array && array[i])
-		free(array[i++]);
+	if (array)
+	{
+		while (1)
+		{
+			if (array[i])
+			{
+				free(array[i++]);
+			}
+			else
+				break ;
+		}
+	}
 	free(array);
 }
 
@@ -97,5 +107,6 @@ void	ft_command_table_free(t_minishell *msh)
 void	ft_free_minishell(t_minishell *minishell)
 {
 	ft_free_hash(minishell->env_table);
+	//free_2d_array(minishell->env);
 	exit(minishell->exit_status);
 }

valgrind_filter.supp

@@ -0,0 +1,14 @@
+{
+    readline
+    Memcheck:Leak
+    fun:*
+    ...
+    fun:readline
+}
+{
+    add_history
+    Memcheck:Leak
+    fun:*
+    ...
+    fun:add_history
+}