Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Verify map exception leak fix #35

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Verify map exception leak fix #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e055015
Fixed leak in parser when verify_map would fail and not free textdata…
Sep 4, 2024
0d0abfa
Added start_on_edge.cub bad map for testing purposes
Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions includes/cub3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
/* ::: :::::::: */
/* cub3d.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tsuchen <tsuchen@student.42.fr> +#+ +:+ +#+ */
/* By: jteissie <jteissie@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/15 00:19:44 by tsuchen #+# #+# */
/* Updated: 2024/09/04 12:28:56 by tsuchen ### ########.fr */
/* Updated: 2024/09/04 13:18:12 by jteissie ### ########.fr */
/* */
/* ************************************************************************** */

Expand Down Expand Up @@ -139,6 +139,7 @@ typedef struct s_data
} t_data;

int cleanup(t_data *data);
void cleanup_textures(t_textdata *textures, void *mlx);
int game_init(t_data *data);
int key_events(int keycode, t_data *data);
int mouse_move(int x, int y, t_data *data);
Expand Down
14 changes: 7 additions & 7 deletions includes/parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
/* ::: :::::::: */
/* parser.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tsuchen <tsuchen@student.42.fr> +#+ +:+ +#+ */
/* By: jteissie <jteissie@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/15 15:00:57 by jteissie #+# #+# */
/* Updated: 2024/09/03 16:25:54 by tsuchen ### ########.fr */
/* Updated: 2024/09/04 13:29:24 by jteissie ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -29,11 +29,11 @@ typedef enum e_texture

typedef struct s_textdata
{
void *text_img[5];
int tex_h[5];
int tex_w[5];
char *text_paths[5];
char *text_addr[5];
void *text_img[TEXTURES_PATHS];
int tex_h[TEXTURES_PATHS];
int tex_w[TEXTURES_PATHS];
char *text_paths[TEXTURES_PATHS];
char *text_addr[TEXTURES_PATHS];
int floor;
int ceiling;
int textures_nb;
Expand Down
17 changes: 17 additions & 0 deletions maps/bad_maps/start_on_edge.cub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
NO ./assets/made_wall_n.xpm
SO ./assets/made_wall_s.xpm
WE ./assets/made_wall_w.xpm
EA ./assets/made_wall_e.xpm
D ./assets/made_door.xpm

F 64, 64, 64
C 182,182,182

1111111
1000001
1000001
100N001
1000001
1111111
1101 000001
111111110011111
6 changes: 3 additions & 3 deletions srcs/cleanup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
/* ::: :::::::: */
/* cleanup.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tsuchen <tsuchen@student.42.fr> +#+ +:+ +#+ */
/* By: jteissie <jteissie@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/27 17:04:32 by jteissie #+# #+# */
/* Updated: 2024/09/03 17:36:22 by tsuchen ### ########.fr */
/* Updated: 2024/09/04 13:17:57 by jteissie ### ########.fr */
/* */
/* ************************************************************************** */

#include "cub3d.h"

static void cleanup_textures(t_textdata *textures, void *mlx)
void cleanup_textures(t_textdata *textures, void *mlx)
{
if (textures->text_img[N])
mlx_destroy_image(mlx, textures->text_img[N]);
Expand Down
4 changes: 2 additions & 2 deletions srcs/parser/get_textures_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: jteissie <[email protected]> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/28 17:29:47 by jteissie #+# #+# */
/* Updated: 2024/08/29 14:00:13 by jteissie ### ########.fr */
/* Updated: 2024/09/04 13:29:06 by jteissie ### ########.fr */
/* */
/* ************************************************************************** */

Expand Down Expand Up @@ -97,7 +97,7 @@ void panic_clean(t_textdata *textures)
size_t i;

i = 0;
while (i < 4)
while (i < TEXTURES_PATHS)
{
if (textures->text_paths[i])
free(textures->text_paths[i]);
Expand Down
5 changes: 3 additions & 2 deletions srcs/parser/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: jteissie <[email protected]> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/15 12:12:00 by tsuchen #+# #+# */
/* Updated: 2024/09/02 14:37:40 by jteissie ### ########.fr */
/* Updated: 2024/09/04 13:18:57 by jteissie ### ########.fr */
/* */
/* ************************************************************************** */

Expand Down Expand Up @@ -102,10 +102,11 @@ int parse_map(t_data *data)
data->map = build_map(data, line);
close(data->map_fd);
if (!data->map)
return (PANIC);
return (cleanup_textures(data->textures, data->mlx), PANIC);
if (verify_map(data->map, data) == MAP_ERR)
{
ft_putstr_fd("Error\n", STDERR_FILENO);
cleanup_textures(data->textures, data->mlx);
return (ft_free_all(data->map), PANIC);
}
return (SUCCESS);
Expand Down
Loading