aboutsummaryrefslogtreecommitdiff
path: root/ft_strjoin.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2019-10-21 20:25:32 +0200
committerCharles <sircharlesaze@gmail.com>2019-10-21 20:25:32 +0200
commit0cf7761bf2985f683b1b73dfe5bdb731672e2b7f (patch)
tree3aff24216409fa5ac313b2ff686f3e23ba9493ff /ft_strjoin.c
parent70a7a3a54d4e300c7ec75d18d14d6d6b174c9ee4 (diff)
downloadlibft-0cf7761bf2985f683b1b73dfe5bdb731672e2b7f.tar.gz
libft-0cf7761bf2985f683b1b73dfe5bdb731672e2b7f.tar.bz2
libft-0cf7761bf2985f683b1b73dfe5bdb731672e2b7f.zip
Added protection on part2 and changed lstmap according to the subject
Diffstat (limited to 'ft_strjoin.c')
-rw-r--r--ft_strjoin.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ft_strjoin.c b/ft_strjoin.c
index a282c53..0078d65 100644
--- a/ft_strjoin.c
+++ b/ft_strjoin.c
@@ -17,6 +17,8 @@ char *ft_strjoin(char const *s1, char const *s2)
{
char *joined;
+ if (s1 == NULL || s2 == NULL)
+ return (NULL);
if ((joined = (char*)malloc(sizeof(char)
* (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL)
return (NULL);