tvdu29/lem_in
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrected invalid read on print_map

Browse Source 
caused by exessive ft_strdel instruction in lm_parser
This commit is contained in:
Tanguy MAZE 2019-04-29 13:08:08 +02:00
parent a51c8ad81d
commit b22a1a5af7
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/lem_in.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */ /* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/04/29 12:40:52 by mndhlovu ### ########.fr */ /* Updated: 2019/04/29 12:54:07 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -22,7 +22,7 @@ static int lem_in(t_syntax *synt, t_holder *holder,
return (0); return (0);
if ((lm_adj_parser(lmdata, holder) == 0)) if ((lm_adj_parser(lmdata, holder) == 0))
return (0); return (0);
//print_map(lmdata); print_map(lmdata);
lm_clear_unv(holder); lm_clear_unv(holder);
get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind); , get_node_role(lmdata, 'e')->ind);

9
srcs/lm_parser.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/20 15:24:51 by mndhlovu #+# #+# */ /* Created: 2019/04/20 15:24:51 by mndhlovu #+# #+# */
/* Updated: 2019/04/29 12:45:25 by mndhlovu ### ########.fr */ /* Updated: 2019/04/29 13:07:10 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -84,17 +84,10 @@ int lm_parser(t_syntax *synt
if ((add_line_map(ldata, raw))) if ((add_line_map(ldata, raw)))
return (0); return (0);
if (!(lm_get_ant_(index, ldata, synt, raw)) && index == 0) if (!(lm_get_ant_(index, ldata, synt, raw)) && index == 0)
{
//ft_strdel(&raw);
return (0); return (0);
}
lm_locate_cd(index, synt, raw); lm_locate_cd(index, synt, raw);
if (!(lm_get_vertices(index, synt, ldata, holder, raw))) if (!(lm_get_vertices(index, synt, ldata, holder, raw)))
{
ft_strdel(&raw);
return (0); return (0);
}
ft_strdel(&raw);
index++; index++;
} }
ft_strdel(&raw); ft_strdel(&raw);

5
srcs/print_map.c
View File

@ -6,11 +6,12 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/24 17:35:29 by tmaze #+# #+# */ /* Created: 2019/04/24 17:35:29 by tmaze #+# #+# */
/* Updated: 2019/04/29 12:40:25 by mndhlovu ### ########.fr */ /* Updated: 2019/04/29 13:05:56 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "lem_in.h" #include "lem_in.h"
#include <stdio.h>
void del_map(t_lmdata *data) void del_map(t_lmdata *data)
{ {
@ -18,9 +19,9 @@ void del_map(t_lmdata *data)
while (data->map) while (data->map)
{ {
ft_strdel(&(data->map->line));
tmp = data->map; tmp = data->map;
data->map = data->map->next; data->map = data->map->next;
ft_strdel(&(tmp->line));
ft_memdel((void**)&tmp); ft_memdel((void**)&tmp);
} }
} }