From 5dcf05c8a2d313ddf18e3487191b51627a6225de Mon Sep 17 00:00:00 2001 From: kinou-p Date: Wed, 16 Dec 2020 16:53:00 +0100 Subject: [PATCH] push --- ft_strjoin.c | 6 +++--- ft_strmapi.c | 4 +++- ft_strtrim.c | 4 ++-- ft_substr.c | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ft_strjoin.c b/ft_strjoin.c index 8330bd5..9fa85fd 100644 --- a/ft_strjoin.c +++ b/ft_strjoin.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/12/11 15:38:13 by apommier #+# #+# */ -/* Updated: 2020/12/11 16:20:03 by apommier ### ########.fr */ +/* Updated: 2020/12/16 16:47:01 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,14 +23,14 @@ char *ft_strjoin(char const *s1, char const *s2) dest = (char*)malloc(sizeof(char) * (ft_strlen(s1) + ft_strlen(s2) + 1)); if (dest == 0) return (0); - while (s1[i]) + while (s1[i] && s1) { dest[j] = s1[i]; j++; i++; } i = 0; - while (s2[i]) + while (s2[i] && s2) { dest[j] = s2[i]; j++; diff --git a/ft_strmapi.c b/ft_strmapi.c index 2f7b21d..0040b83 100644 --- a/ft_strmapi.c +++ b/ft_strmapi.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/12/08 19:03:09 by apommier #+# #+# */ -/* Updated: 2020/12/13 20:59:47 by apommier ### ########.fr */ +/* Updated: 2020/12/16 16:52:49 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,6 +17,8 @@ char *ft_strmapi(char const *s, char (*f)(unsigned int, char)) char *dest; int i; + if (!s) + return (0); i = 0; dest = (char*)ft_calloc(ft_strlen(s) + 1, sizeof(char)); if (!dest) diff --git a/ft_strtrim.c b/ft_strtrim.c index ee58b89..2d291a7 100644 --- a/ft_strtrim.c +++ b/ft_strtrim.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 23:52:05 by apommier #+# #+# */ -/* Updated: 2020/12/16 16:42:35 by apommier ### ########.fr */ +/* Updated: 2020/12/16 16:43:46 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,7 +43,7 @@ char *ft_strtrim(char const *s1, char const *set) len = len - i - j; if (len < 0) len = 0; - if (!(dest = ft_calloc(len + 1, 1)) || !s1); + if (!(dest = ft_calloc(len + 1, 1)) || !s1) return (0); j = 0; while (s1[i] && len - j && len > 0) diff --git a/ft_substr.c b/ft_substr.c index b40f17a..7e4d95b 100644 --- a/ft_substr.c +++ b/ft_substr.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/11/29 22:54:40 by apommier #+# #+# */ -/* Updated: 2020/12/13 20:53:46 by apommier ### ########.fr */ +/* Updated: 2020/12/16 16:45:34 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,6 +17,8 @@ char *ft_substr(char const *s, unsigned int start, size_t len) char *dest; unsigned int i; + if (!s) + return (0); i = 0; dest = malloc(1 * len + 1); if (dest == 0)