From 981140cbebd0fb6a9a5303c03c52c5238cbcfc6b Mon Sep 17 00:00:00 2001
From: adjoly <adamjly@proton.me>
Date: Thu, 16 May 2024 17:38:11 +0200
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20Fixed?=
 =?UTF-8?q?=20strjoin=20free=20if=20str=20not=20present?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libft/src/str/ft_strjoin.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libft/src/str/ft_strjoin.c b/libft/src/str/ft_strjoin.c
index 8992bf7..7511850 100644
--- a/libft/src/str/ft_strjoin.c
+++ b/libft/src/str/ft_strjoin.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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);
 	ft_strlcpy(fstr, s1, ft_strlen(s1) + 1);
 	ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1);
-	if (s1[0])
+	if (s1)
 		free(s1);
 	return (fstr);
 }
@@ -59,7 +59,8 @@ char	*ft_strjoin_free_s2(const char *s1, char *s2)
 		return (NULL);
 	ft_strlcpy(fstr, s1, ft_strlen(s1) + 1);
 	ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1);
-	free(s2);
+	if (s2)
+		free(s2);
 	return (fstr);
 }
 
@@ -76,7 +77,9 @@ char	*ft_strjoin_free(char *s1, char *s2)
 		return (NULL);
 	ft_strlcpy(fstr, s1, ft_strlen(s1) + 1);
 	ft_strlcat(fstr, s2, ft_strlen(s1) + ft_strlen(s2) + 1);
-	free(s1);
-	free(s2);
+	if (s1)
+		free(s1);
+	if (s2)
+		free(s2);
 	return (fstr);
 }