From c82ba9bccbef6a14945607b57b50a95677d0c3cb Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Tue, 28 May 2019 19:36:21 +0200 Subject: [PATCH] presque toutes les erreures de vlgrind resolues, sauf une derniere dans error_proxy --- f_handle_errors.c | 10 +++++----- f_parse_input.c | 2 +- f_read_file.c | 4 ++-- f_search_map.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/f_handle_errors.c b/f_handle_errors.c index 9e85e87..74ff957 100644 --- a/f_handle_errors.c +++ b/f_handle_errors.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ -/* Updated: 2019/05/28 17:27:17 by hulamy ### ########.fr */ +/* Updated: 2019/05/28 19:35:38 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -119,13 +119,13 @@ int check_tetri_errors_proxy(char *tetri) j = 0; while (tetri[i]) { - if (tetri[i] == '#' && tetri[i + 1] == '#') + if (i < 19 && tetri[i] == '#' && tetri[i + 1] == '#') j++; - if (tetri[i] == '#' && tetri[i - 1] == '#') + if (i > 0 && tetri[i] == '#' && tetri[i - 1] == '#') j++; - if (tetri[i] == '#' && tetri[i + 5] == '#') + if (i < 15 && tetri[i] == '#' && tetri[i + 5] == '#') j++; - if (tetri[i] == '#' && tetri[i - 5] == '#') + if (i > 4 && tetri[i] == '#' && tetri[i - 5] == '#') j++; if (tetri[i] == '.' || tetri[i] == '\n') i++; diff --git a/f_parse_input.c b/f_parse_input.c index eded856..dd58683 100644 --- a/f_parse_input.c +++ b/f_parse_input.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */ -/* Updated: 2019/05/28 17:27:44 by hulamy ### ########.fr */ +/* Updated: 2019/05/28 19:05:05 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/f_read_file.c b/f_read_file.c index ba3b5d7..0a862ec 100644 --- a/f_read_file.c +++ b/f_read_file.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/13 12:09:46 by vmanzoni #+# #+# */ -/* Updated: 2019/05/28 17:02:19 by hulamy ### ########.fr */ +/* Updated: 2019/05/28 18:36:35 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -28,7 +28,7 @@ char *read_file(char *file) || ((rv = read(fd, &buf, BUFF_SIZE)) < 0) \ || !(result = malloc(sizeof(char) * rv))) return (NULL); - buf[rv] = '\0'; + buf[rv - 1] = '\0'; i = -1; while (buf[++i]) result[i] = buf[i]; diff --git a/f_search_map.c b/f_search_map.c index 1401ed8..89df20c 100644 --- a/f_search_map.c +++ b/f_search_map.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */ -/* Updated: 2019/05/28 17:33:43 by hulamy ### ########.fr */ +/* Updated: 2019/05/28 18:19:15 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -161,8 +161,8 @@ int search_map(t_fillist *list) if (!(map = (unsigned int *)malloc(sizeof(*map) * num))) return (0); check_same_tetri(list, num); - while (num) - map[num--] = 0; + while (num--) + map[num] = 0; i = fill_map(map, list, size++); } return (print_binary_map(map, size, list->dope));