da7e/42-libft
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

calloc fix

Browse Source
This commit is contained in:
David Gailleton
2025-11-12 17:23:46 +01:00
parent 187e68e1aa
commit 53b2050d11
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ft_calloc.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/05 19:26:10 by dgaillet #+# #+# */ /* 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; void *all_mem;
if ((nmemb * size < nmemb || nmemb * size < size) if (size && nmemb > SIZE_MAX / size)
&& size > 0 && nmemb > 0)
return (NULL); return (NULL);
all_mem = malloc(size * nmemb); all_mem = malloc(size * nmemb);
if (!all_mem) if (!all_mem)

2
ft_lstclear_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/09 15:31:17 by dgaillet #+# #+# */ /* 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

4
ft_lstdelone_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/09 15:22:02 by dgaillet #+# #+# */ /* 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 *)) void ft_lstdelone(t_list *lst, void (*del)(void *))
{ {
if (!lst) if (!lst || !del)
return ; return ;
del(lst->content); del(lst->content);
free(lst); free(lst);

4
ft_striteri.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/08 17:36:38 by dgaillet #+# #+# */ /* 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; unsigned int i;
if (!s) if (!f)
return ; return ;
i = 0; i = 0;
while (s[i]) while (s[i])

4
ft_strmapi.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/08 17:30:25 by dgaillet #+# #+# */ /* 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; char *str;
unsigned int i; unsigned int i;
if (!s) if (!s || !f)
return (NULL); return (NULL);
i = 0; i = 0;
str = malloc(sizeof(char) * (ft_strlen(s) + 1)); str = malloc(sizeof(char) * (ft_strlen(s) + 1));

4
libft.h
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/05 09:49:43 by dgaillet #+# #+# */ /* 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 <stdlib.h>
# include <unistd.h> # include <unistd.h>
# include <limits.h>
# include <stdint.h>
typedef struct s_list typedef struct s_list
{ {