From dff0b44b7698649890931f77a0e309167823d752 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Sat, 1 Mar 2025 17:06:36 -0500 Subject: [PATCH 1/2] Fix Resource Leak Issue --- raster/r.colors/stats.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/raster/r.colors/stats.c b/raster/r.colors/stats.c index bb888506db1..69b0e3d11b9 100644 --- a/raster/r.colors/stats.c +++ b/raster/r.colors/stats.c @@ -35,11 +35,12 @@ int get_stats(struct maps_info *input_maps, struct Cell_stats *statf) cell = Rast_allocate_c_buf(); nrows = Rast_window_rows(); ncols = Rast_window_cols(); + char *mname = G_fully_qualified_name(input_maps->names[i], + input_maps->mapsets[i]); G_verbose_message(_("(%i/%i) Reading raster map <%s>..."), i + 1, - input_maps->num, - G_fully_qualified_name(input_maps->names[i], - input_maps->mapsets[i])); + input_maps->num, mname); + G_free(mname); for (row = 0; row < nrows; row++) { G_percent(row, nrows, 2); @@ -127,9 +128,10 @@ void get_fp_stats(struct maps_info *input_maps, struct FP_stats *statf, ncols = map3d->window.cols; ndepths = map3d->window.depths; } - + char *mname = G_fully_qualified_name(name, mapset); G_verbose_message(_("(%i/%i) Reading map <%s>..."), i, input_maps->num, - G_fully_qualified_name(name, mapset)); + mname); + G_free(mname); for (depth = 0; depth < ndepths; depth++) { for (row = 0; row < nrows; row++) { From d44fffcbed1fa859ec99829ab892730e5d8416ff Mon Sep 17 00:00:00 2001 From: ShubhamDesai <42180509+ShubhamDesai@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:18:05 -0500 Subject: [PATCH 2/2] Update raster/r.colors/stats.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- raster/r.colors/stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/raster/r.colors/stats.c b/raster/r.colors/stats.c index 69b0e3d11b9..9ec155423cd 100644 --- a/raster/r.colors/stats.c +++ b/raster/r.colors/stats.c @@ -36,7 +36,7 @@ int get_stats(struct maps_info *input_maps, struct Cell_stats *statf) nrows = Rast_window_rows(); ncols = Rast_window_cols(); char *mname = G_fully_qualified_name(input_maps->names[i], - input_maps->mapsets[i]); + input_maps->mapsets[i]); G_verbose_message(_("(%i/%i) Reading raster map <%s>..."), i + 1, input_maps->num, mname);