realloc

cub3d.h

@@ -6,7 +6,7 @@
 /*   By: fgras-ca <fgras-ca@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/14 16:56:52 by fgras-ca          #+#    #+#             */
-/*   Updated: 2024/01/30 13:57:20 by fgras-ca         ###   ########.fr       */
+/*   Updated: 2024/01/30 15:14:01 by fgras-ca         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -472,6 +472,6 @@ bool	check_for_multiple_players(bool found_player);
 int		check_boundaries(t_point p, t_map_check *map_check);
 int		is_space_surrounded_by_walls(t_map_check *map_check, t_point p);
 void	*ft_calloc(size_t nmemb, size_t size);
-void	*ft_realloc(void *ptr, size_t size);
+void	*ft_realloc(void *ptr, size_t newsize, size_t oldsize);
 
 #endif

draw/ft_load_textures.c

@@ -6,7 +6,7 @@
 /*   By: fgras-ca <fgras-ca@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/14 20:30:59 by fgras-ca          #+#    #+#             */
-/*   Updated: 2024/01/29 17:13:50 by fgras-ca         ###   ########.fr       */
+/*   Updated: 2024/01/30 15:05:11 by fgras-ca         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

parsing/ft_textures_and_colors.c

@@ -6,7 +6,7 @@
 /*   By: fgras-ca <fgras-ca@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/16 16:19:13 by fgras-ca          #+#    #+#             */
-/*   Updated: 2024/01/30 13:55:56 by fgras-ca         ###   ########.fr       */
+/*   Updated: 2024/01/30 15:15:52 by fgras-ca         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,9 +24,11 @@ bool	read_map_line(int fd, char *buffer, ssize_t *bytes_read)
 bool	process_line(char **map_buffer, int *map_length, char *line)
 {
 	ssize_t	bytes_read;
+	size_t	new_total_size;
 
 	bytes_read = ft_strlen(line);
-	*map_buffer = ft_realloc(*map_buffer, *map_length + bytes_read + 1);
+	new_total_size = *map_length + bytes_read + 1;
+	*map_buffer = ft_realloc(*map_buffer, new_total_size, *map_length);
 	if (!*map_buffer)
 	{
 		perror("Error reallocating memory for map buffer");

utils/ft_utils_mem.c

@@ -6,7 +6,7 @@
 /*   By: fgras-ca <fgras-ca@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/30 12:33:22 by fgras-ca          #+#    #+#             */
-/*   Updated: 2024/01/30 13:58:28 by fgras-ca         ###   ########.fr       */
+/*   Updated: 2024/01/30 15:13:41 by fgras-ca         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -39,25 +39,24 @@ void	*ft_calloc(size_t nmemb, size_t size)
 	return (ptr);
 }
 
-void	*ft_realloc(void *ptr, size_t size)
+void	*ft_realloc(void *ptr, size_t newsize, size_t oldsize)
 {
-	void	*new_ptr;
+	char	*newptr;
 
 	if (ptr == NULL)
 	{
-		return (malloc(size));
+		return (malloc(newsize));
 	}
-	if (size == 0)
+	if (newsize <= oldsize)
 	{
-		free(ptr);
-		return (NULL);
+		return (ptr);
 	}
-	new_ptr = malloc(size);
-	if (new_ptr == NULL)
+	newptr = malloc(newsize);
+	if (newptr == NULL)
 	{
 		return (NULL);
 	}
-	ft_memcpy(new_ptr, ptr, size);
+	ft_memcpy(newptr, ptr, oldsize);
 	free(ptr);
-	return (new_ptr);
+	return (newptr);
 }