da7e/42-GNL
1
0
Fork 0
mirror of https://github.com/DavidGailleton/42-GNL.git synced 2026-01-26 23:11:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix buffer overflow on other fd in bonus

Browse Source
This commit is contained in:
David Gailleton
2025-11-28 13:48:08 +01:00
parent a54d38533e
commit 42e30ebaae
3 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
get_next_line.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/21 17:20:41 by dgaillet #+# #+# */ /* Created: 2025/11/21 17:20:41 by dgaillet #+# #+# */
/* Updated: 2025/11/27 18:19:30 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/28 13:47:15 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -88,12 +88,15 @@ static char *extract_all_nl(char buf[BUFFER_SIZE], int fd, char *str, int nl_i)
return (str); return (str);
} }
static char *ft_gnl_extra(char buf[BUFFER_SIZE], int fd) char *get_next_line(int fd)
{ {
static char buf[BUFFER_SIZE + 1];
int nl_i; int nl_i;
int temp; int temp;
char *str; char *str;
if (fd < 0 || BUFFER_SIZE <= 0)
return (NULL);
nl_i = index_of_nl(buf, BUFFER_SIZE); nl_i = index_of_nl(buf, BUFFER_SIZE);
if (nl_i >= 0) if (nl_i >= 0)
{ {
@@ -106,14 +109,3 @@ static char *ft_gnl_extra(char buf[BUFFER_SIZE], int fd)
str = extract_all_nl(buf, fd, ft_substr("", 0, 1), nl_i); str = extract_all_nl(buf, fd, ft_substr("", 0, 1), nl_i);
return (str); return (str);
} }
char *get_next_line(int fd)
{
static char buf[BUFFER_SIZE];
char *to_return;
if (fd < 0)
return (NULL);
to_return = ft_gnl_extra(buf, fd);
return (to_return);
}

28
get_next_line_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/24 15:55:25 by dgaillet #+# #+# */ /* Created: 2025/11/24 15:55:25 by dgaillet #+# #+# */
/* Updated: 2025/11/27 18:20:47 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/28 13:47:24 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -23,9 +23,9 @@ static int del_before_nl(char buf[BUFFER_SIZE])
if (nl_i >= 0) if (nl_i >= 0)
{ {
temp = ft_substr(buf, nl_i + 1, BUFFER_SIZE - nl_i); temp = ft_substr(buf, nl_i + 1, BUFFER_SIZE - nl_i);
ft_bzero(buf, BUFFER_SIZE);
if (!temp) if (!temp)
return (-1); return (-1);
ft_bzero(buf, BUFFER_SIZE);
i = 0; i = 0;
while (temp[i]) while (temp[i])
{ {
@@ -88,32 +88,24 @@ static char *extract_all_nl(char buf[BUFFER_SIZE], int fd, char *str, int nl_i)
return (str); return (str);
} }
static char *ft_gnl_extra(char buf[BUFFER_SIZE], int fd) char *get_next_line(int fd)
{ {
static char bufs[1024][BUFFER_SIZE + 1];
int nl_i; int nl_i;
int temp; int temp;
char *str; char *str;
nl_i = index_of_nl(buf, BUFFER_SIZE); if (fd < 0 || BUFFER_SIZE <= 0)
return (NULL);
nl_i = index_of_nl(bufs[fd], BUFFER_SIZE);
if (nl_i >= 0) if (nl_i >= 0)
{ {
str = ft_substr(buf, 0, nl_i + 1); str = ft_substr(bufs[fd], 0, nl_i + 1);
temp = del_before_nl(buf); temp = del_before_nl(bufs[fd]);
if (temp < 0) if (temp < 0)
return (free(str), NULL); return (free(str), NULL);
} }
else else
str = extract_all_nl(buf, fd, ft_substr("", 0, 1), nl_i); str = extract_all_nl(bufs[fd], fd, ft_substr("", 0, 0), nl_i);
return (str); return (str);
} }
char *get_next_line(int fd)
{
static char strs[1024][BUFFER_SIZE];
char *to_return;
if (fd < 0)
return (NULL);
to_return = ft_gnl_extra(strs[fd], fd);
return (to_return);
}

4
get_next_line_utils_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/24 16:04:39 by dgaillet #+# #+# */ /* Created: 2025/11/24 16:04:39 by dgaillet #+# #+# */
/* Updated: 2025/11/27 13:43:16 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/28 12:15:01 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -94,7 +94,7 @@ void ft_bzero(void *s, size_t n)
{ {
while (n > 0) while (n > 0)
{ {
*((unsigned char *) s) = '\0'; *((unsigned char *) s) = 0;
s++; s++;
n--; n--;
} }