From 1b0b30cfd016c0abef1fc2c42c56a0a149249ea1 Mon Sep 17 00:00:00 2001 From: Lukas Jiriste Date: Thu, 4 Jul 2024 16:38:34 +0200 Subject: [PATCH] Fix wrong malloc and infinite loop in ft_vec --- ft_arr/ft_vec_copy.c | 4 ++-- ft_arr/ft_vec_is_equal.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ft_arr/ft_vec_copy.c b/ft_arr/ft_vec_copy.c index 46e5100..b60c14f 100644 --- a/ft_arr/ft_vec_copy.c +++ b/ft_arr/ft_vec_copy.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/28 12:02:22 by ljiriste #+# #+# */ -/* Updated: 2024/06/28 12:34:13 by ljiriste ### ########.fr */ +/* Updated: 2024/07/04 16:36:18 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,7 +34,7 @@ t_arr_stat ft_vec_copy(t_vec *dest, const t_vec *src, void *tmp; t_arr_stat res; - tmp = malloc(dest->el_size); + tmp = malloc(src->el_size); if (!tmp) return (alloc_fail); res = prepare_for_copy(dest, src); diff --git a/ft_arr/ft_vec_is_equal.c b/ft_arr/ft_vec_is_equal.c index 693a9c4..5b62efb 100644 --- a/ft_arr/ft_vec_is_equal.c +++ b/ft_arr/ft_vec_is_equal.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/28 14:07:57 by ljiriste #+# #+# */ -/* Updated: 2024/06/28 14:12:53 by ljiriste ### ########.fr */ +/* Updated: 2024/07/04 15:34:24 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -28,6 +28,7 @@ int ft_vec_is_equal(const t_vec *vec1, const t_vec *vec2, el2 = ft_vec_caccess(vec2, i); if (cmp_elements(el1, el2) != 0) return (0); + ++i; } return (1); } -- 2.30.2