42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-05-11 15:08:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🔨」 fix: Fixed strjoin free if str not present

Browse Source
This commit is contained in:
Adam JOLY
2024-05-16 17:38:11 +02:00
parent 0dc8d035d3
commit 981140cbeb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libft/src/str/ft_strjoin.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/03 19:35:01 by mmoussou #+# #+# */ /* Created: 2024/01/03 19:35:01 by mmoussou #+# #+# */
/* Updated: 2024/02/26 03:07:16 by mmoussou ### ########.fr */ /* Updated: 2024/05/16 17:36:58 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -41,7 +41,7 @@ char *ft_strjoin_free_s1(char *s1, const char *s2)
return (NULL); return (NULL);
ft_strlcpy(fstr, s1, ft_strlen(s1) + 1); ft_strlcpy(fstr, s1, ft_strlen(s1) + 1);
ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1); ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1);
if (s1[0]) if (s1)
free(s1); free(s1);
return (fstr); return (fstr);
} }
@ -59,7 +59,8 @@ char *ft_strjoin_free_s2(const char *s1, char *s2)
return (NULL); return (NULL);
ft_strlcpy(fstr, s1, ft_strlen(s1) + 1); ft_strlcpy(fstr, s1, ft_strlen(s1) + 1);
ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1); ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1);
free(s2); if (s2)
free(s2);
return (fstr); return (fstr);
} }
@ -76,7 +77,9 @@ char *ft_strjoin_free(char *s1, char *s2)
return (NULL); return (NULL);
ft_strlcpy(fstr, s1, ft_strlen(s1) + 1); ft_strlcpy(fstr, s1, ft_strlen(s1) + 1);
ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1); ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1);
free(s1); if (s1)
free(s2); free(s1);
if (s2)
free(s2);
return (fstr); return (fstr);
} }