Kinou/Cub3D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix leak isafile

Browse Source
This commit is contained in:
kinou-p 2022-06-15 14:36:47 +02:00
parent cda81e1fd9
commit ae3e559c75
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
srcs/get_texture_array.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/05/06 16:10:11 by apommier #+# #+# */
/* Updated: 2022/06/15 14:23:32 by apommier ### ########.fr */
/* Updated: 2022/06/15 14:36:04 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -40,11 +40,6 @@ void put_texture_in_struct(char type, unsigned char *texture, t_data *img)
}
}
int verify_texture()
{
}
int is_nbr(char *str)
{
int i;

18
srcs/parsing/parse_map.c
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* parse_map.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/05/10 17:54:25 by sadjigui #+# #+# */
/* Updated: 2022/06/14 16:32:34 by sadjigui ### ########.fr */
/* Updated: 2022/06/15 14:35:05 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -269,6 +269,7 @@ char **isafile(char **av, t_data *img)
img->err = 0;
fd = open(av[1], O_RDONLY);
img->to_be_free.fd_one = fd;
str = NULL;
tmp = NULL;
if (fd == - 1)
@ -283,29 +284,32 @@ char **isafile(char **av, t_data *img)
img->err = 2;
}
tmp = ft_strjoin(str, line);
if (str != NULL)
free(str);
str = tmp;
//size_line(line, img);
free(line);
line = NULL;
if (str != NULL)
free(str);
if (!tmp)
quit_game(img);
str = tmp;
}
if (img->err == 2)
{
// free(line);
free(str);
ft_exit("Error\nBad texture file\n");
}
split = ft_split(str, '\n');
img->to_be_free.one_tab = split;
free(str);
free(line);
close(fd);
img->to_be_free.fd_one = -1;
int pass = 0;
pass = check_texture_color(split, img);
check_zero_one(split + pass, img);
//leaks here
transform_map(split + pass, img);
free_double(split);
img->to_be_free.one_tab = 0;
return (0);
}