diff --git a/ft_calloc.c b/ft_calloc.c
index 93fd9b3..e2c120b 100644
--- a/ft_calloc.c
+++ b/ft_calloc.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 19:26:10 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/12 15:51:55 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/12 17:05:12 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,8 +16,7 @@ void	*ft_calloc(size_t nmemb, size_t size)
 {
 	void	*all_mem;
 
-	if ((nmemb * size < nmemb || nmemb * size < size)
-		&& size > 0 && nmemb > 0)
+	if (size && nmemb > SIZE_MAX / size)
 		return (NULL);
 	all_mem = malloc(size * nmemb);
 	if (!all_mem)
diff --git a/ft_lstclear_bonus.c b/ft_lstclear_bonus.c
index aab914a..3457667 100644
--- a/ft_lstclear_bonus.c
+++ b/ft_lstclear_bonus.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/09 15:31:17 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/12 13:15:37 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/12 17:07:13 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,7 +17,7 @@ void	ft_lstclear(t_list **lst, void (*del)(void *))
 	t_list	*temp;
 	t_list	*next;
 
-	if (!lst ||!*lst)
+	if (!lst || !*lst)
 		return ;
 	temp = *lst;
 	next = temp->next;
diff --git a/ft_lstdelone_bonus.c b/ft_lstdelone_bonus.c
index 87da2fd..f3b5a7d 100644
--- a/ft_lstdelone_bonus.c
+++ b/ft_lstdelone_bonus.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/09 15:22:02 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/11 16:10:09 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/12 17:07:58 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,7 @@
 
 void	ft_lstdelone(t_list *lst, void (*del)(void *))
 {
-	if (!lst)
+	if (!lst || !del)
 		return ;
 	del(lst->content);
 	free(lst);
diff --git a/ft_striteri.c b/ft_striteri.c
index 9ea3f65..dbc84df 100644
--- a/ft_striteri.c
+++ b/ft_striteri.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/08 17:36:38 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/12 13:32:30 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/12 17:21:21 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,7 @@ void	ft_striteri(char *s, void (*f)(unsigned int, char*))
 {
 	unsigned int	i;
 
-	if (!s)
+	if (!f)
 		return ;
 	i = 0;
 	while (s[i])
diff --git a/ft_strmapi.c b/ft_strmapi.c
index 09c7c9a..b3fe0fb 100644
--- a/ft_strmapi.c
+++ b/ft_strmapi.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/08 17:30:25 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/12 13:39:16 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/12 17:22:49 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,7 +17,7 @@ char	*ft_strmapi(char const *s, char (*f)(unsigned int, char))
 	char			*str;
 	unsigned int	i;
 
-	if (!s)
+	if (!s || !f)
 		return (NULL);
 	i = 0;
 	str = malloc(sizeof(char) * (ft_strlen(s) + 1));
diff --git a/libft.h b/libft.h
index 704b23e..d375877 100644
--- a/libft.h
+++ b/libft.h
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 09:49:43 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/10 18:18:17 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/12 17:05:00 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,6 +15,8 @@
 
 # include <stdlib.h>
 # include <unistd.h>
+# include <limits.h>
+# include <stdint.h>
 
 typedef struct s_list
 {