From 034c9881357b69b33e5268f4c00c0b1ae986978d Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Tue, 3 Jan 2017 15:36:25 +0100 Subject: [PATCH] strcmp protection --- libft/src/sstr/ft_sstradd.c | 4 ++-- libft/src/str/ft_strcmp.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libft/src/sstr/ft_sstradd.c b/libft/src/sstr/ft_sstradd.c index e01e4f61..fef02c2b 100644 --- a/libft/src/sstr/ft_sstradd.c +++ b/libft/src/sstr/ft_sstradd.c @@ -27,8 +27,8 @@ char **ft_sstradd(char **sstr, char *new) return (NULL); if (sstr) ft_memcpy(newlist, sstr, sizeof(char*) * size); - newlist[size++] = ft_strdup(new); - newlist[size] = NULL; + newlist[size] = ft_strdup(new); + newlist[size + 1] = NULL; free(sstr); return (newlist); } diff --git a/libft/src/str/ft_strcmp.c b/libft/src/str/ft_strcmp.c index 641bc5b8..6349ac8c 100644 --- a/libft/src/str/ft_strcmp.c +++ b/libft/src/str/ft_strcmp.c @@ -17,6 +17,8 @@ int ft_strcmp(const char *s1, const char *s2) int i; i = 0; + if (!s1 || !s2) + return (1); while (*(s1 + i) && *(s1 + i) == *(s2 + i)) i++; return (*((unsigned char*)s1 + i) - *((unsigned char*)s2 + i));