aboutsummaryrefslogtreecommitdiff
path: root/get_next_line_utils.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2019-10-20 07:34:25 +0200
committerCharles <sircharlesaze@gmail.com>2019-10-20 07:39:47 +0200
commit891dce09989e8ede692d4a6c23e7a208b09ca4d6 (patch)
treecae404760be9b47f2f63c2a9e02427a37a093843 /get_next_line_utils.c
parenta407fe611354d71330fc352fbc2a9fe268b4104f (diff)
downloadget_next_line-891dce09989e8ede692d4a6c23e7a208b09ca4d6.tar.gz
get_next_line-891dce09989e8ede692d4a6c23e7a208b09ca4d6.tar.bz2
get_next_line-891dce09989e8ede692d4a6c23e7a208b09ca4d6.zip
WIP: Normed, fixed double free in ft_strappend
Diffstat (limited to 'get_next_line_utils.c')
-rw-r--r--get_next_line_utils.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/get_next_line_utils.c b/get_next_line_utils.c
index 929e37b..9bc96d9 100644
--- a/get_next_line_utils.c
+++ b/get_next_line_utils.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/08 08:52:59 by cacharle #+# #+# */
-/* Updated: 2019/10/19 14:09:48 by cacharle ### ########.fr */
+/* Updated: 2019/10/20 07:39:00 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -42,19 +42,11 @@ char *ft_strappend(char *dest, char *src)
{
void *copy;
- if (dest == NULL)
- {
- if ((dest = (char*)malloc(sizeof(char) * (ft_strlen(src) + 1))) == NULL)
- return (NULL);
- ft_strcpy(dest, src);
- /* printf("%s - %s\n", dest, src); */
- return (dest);
- }
if ((copy = (char*)malloc(sizeof(char) * (ft_strlen(dest) + 1))) == NULL)
return (NULL);
ft_strcpy(copy, dest);
- /* free(dest); */
- dest = (char*)malloc(sizeof(char) * (ft_strlen(dest) + ft_strlen(src) + 1));
+ free(dest);
+ dest = (char*)malloc(sizeof(char) * (ft_strlen(copy) + ft_strlen(src) + 1));
if (dest == NULL)
return (NULL);
ft_strcpy(dest, copy);