From 1addf7c4ed61a95f7d6da681547811d2a0eed4be Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Sat, 7 Apr 2018 15:33:49 +0200 Subject: [PATCH] ft_strequ, ft_memdel: add protection --- Makefile | 5 +++-- ft_memdel.c | 9 ++++++--- ft_strnequ.c | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 ft_strnequ.c diff --git a/Makefile b/Makefile index 54ec422..6596f23 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/04/07 15:15:08 by tmaze ### ########.fr # +# Updated: 2018/04/07 15:33:02 by tmaze ### ########.fr # # # #******************************************************************************# @@ -54,7 +54,8 @@ SRCS = \ ft_striteri.c \ ft_strmap.c \ ft_strmapi.c \ - ft_strequ.c + ft_strequ.c \ + ft_strnequ.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_memdel.c b/ft_memdel.c index 8a063c6..1e80242 100644 --- a/ft_memdel.c +++ b/ft_memdel.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/06 18:21:08 by tmaze #+# #+# */ -/* Updated: 2018/04/06 18:29:17 by tmaze ### ########.fr */ +/* Updated: 2018/04/07 15:27:28 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,9 @@ void ft_memdel(void **ap) { - free(*ap); - *ap = NULL; + if (ap && *ap) + { + free(*ap); + *ap = NULL; + } } diff --git a/ft_strnequ.c b/ft_strnequ.c new file mode 100644 index 0000000..5da4b06 --- /dev/null +++ b/ft_strnequ.c @@ -0,0 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strnequ.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/04/07 15:24:01 by tmaze #+# #+# */ +/* Updated: 2018/04/07 15:33:17 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_strnequ(char const *s1, char const *s2, size_t n) +{ + return (ft_strncmp(s1, s2, n) == 0); +}