Add null check

diff --git a/get_next_line.c b/get_next_line.c
index e34210da739ed4efc84220ec3fb253b158d2dee5..46edb73941cdcd67f2eacac1c13389610928d369 100644 (file)
--- a/get_next_line.c
+++ b/get_next_line.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/15 14:13:51 by dkaiser           #+#    #+#             */
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/15 14:13:51 by dkaiser           #+#    #+#             */

-/*   Updated: 2024/03/25 14:21:58 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/25 15:26:21 by dkaiser          ###   ########.fr       */

 /*                                                                            */
 /* ************************************************************************** */
 
 /*                                                                            */
 /* ************************************************************************** */
 


@@ -52,9 +52,8 @@ static void   get_next_line_rec(int fd, char *buf, char **result, int pos)
                        clear_buffer(buf, 0);
                        free(*result);
                        *result = NULL;
                        clear_buffer(buf, 0);
                        free(*result);
                        *result = NULL;

-                       return ;

                }
                }

-               if (readlen > 0)
+               else if (readlen > 0)

                        get_next_line_rec(fd, buf, result, 0);
        }
 }
                        get_next_line_rec(fd, buf, result, 0);
        }
 }

diff --git a/get_next_line_utils.c b/get_next_line_utils.c
index 3f25bba0286c9350519cef6c66d538be7be75782..61171bec307238f2f570e1f187823dfae6858ca4 100644 (file)
--- a/get_next_line_utils.c
+++ b/get_next_line_utils.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/15 14:14:59 by dkaiser           #+#    #+#             */
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/15 14:14:59 by dkaiser           #+#    #+#             */

-/*   Updated: 2024/03/25 14:18:50 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/26 10:49:08 by dkaiser          ###   ########.fr       */

 /*                                                                            */
 /* ************************************************************************** */
 
 /*                                                                            */
 /* ************************************************************************** */
 


@@ -16,6 +16,8 @@ int   ft_strlen(const char *str)
 {
        int     len;
 
 {
        int     len;
 

+       if (!str)
+               return (0);

        len = 0;
        while (str[len])
                len++;
        len = 0;
        while (str[len])
                len++;


@@ -40,7 +42,10 @@ char *str_add_buffer(char *old_str, char *buf, int buf_len)
                len = ft_strlen(old_str) + buf_len;
        result = malloc(sizeof(char) * (len + 1));
        if (!result)
                len = ft_strlen(old_str) + buf_len;
        result = malloc(sizeof(char) * (len + 1));
        if (!result)

+       {
+               free(old_str);

                return (NULL);
                return (NULL);

+       }

        result[len] = '\0';
        i = 0;
        while (old_str && old_str[i])
        result[len] = '\0';
        i = 0;
        while (old_str && old_str[i])