From 4d392faf6ddc228a05c449f02006fa95070149dd Mon Sep 17 00:00:00 2001 From: Lukas Jiriste Date: Fri, 27 Oct 2023 10:32:42 +0200 Subject: [PATCH] Patch invalid write Move "buffer[i] = '\0'" after a branch that handles i < 0. --- get_next_line.c | 4 ++-- get_next_line_bonus.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/get_next_line.c b/get_next_line.c index 4e5cae8..cffebc3 100644 --- a/get_next_line.c +++ b/get_next_line.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/08/28 00:01:15 by ljiriste #+# #+# */ -/* Updated: 2023/10/25 13:06:18 by ljiriste ### ########.fr */ +/* Updated: 2023/10/27 10:24:16 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -96,7 +96,6 @@ char *get_next_line(int fd) if (buffer[0] == '\0') { i = read(fd, buffer, BUFFER_SIZE); - buffer[i] = '\0'; if (i <= 0) delete_file_node(fd, &list); if (i < 0) @@ -106,6 +105,7 @@ char *get_next_line(int fd) } if (i == 0) return (res); + buffer[i] = '\0'; } } return (res); diff --git a/get_next_line_bonus.c b/get_next_line_bonus.c index 4e5cae8..cffebc3 100644 --- a/get_next_line_bonus.c +++ b/get_next_line_bonus.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/08/28 00:01:15 by ljiriste #+# #+# */ -/* Updated: 2023/10/25 13:06:18 by ljiriste ### ########.fr */ +/* Updated: 2023/10/27 10:24:16 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -96,7 +96,6 @@ char *get_next_line(int fd) if (buffer[0] == '\0') { i = read(fd, buffer, BUFFER_SIZE); - buffer[i] = '\0'; if (i <= 0) delete_file_node(fd, &list); if (i < 0) @@ -106,6 +105,7 @@ char *get_next_line(int fd) } if (i == 0) return (res); + buffer[i] = '\0'; } } return (res); -- 2.30.2