push
This commit is contained in:
parent
5dcf05c8a2
commit
f5da1ea830
@ -6,7 +6,7 @@
|
||||
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2020/12/11 15:38:13 by apommier #+# #+# */
|
||||
/* Updated: 2020/12/16 16:47:01 by apommier ### ########.fr */
|
||||
/* Updated: 2020/12/16 16:58:13 by apommier ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -20,8 +20,9 @@ char *ft_strjoin(char const *s1, char const *s2)
|
||||
|
||||
i = 0;
|
||||
j = 0;
|
||||
dest = (char*)malloc(sizeof(char) * (ft_strlen(s1) + ft_strlen(s2) + 1));
|
||||
if (dest == 0)
|
||||
if (!s1 && !s2)
|
||||
return (0);
|
||||
if (!(dest = (char*)malloc(ft_strlen(s1) + ft_strlen(s2) + 1)));
|
||||
return (0);
|
||||
while (s1[i] && s1)
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user