From bf10ebc5659de3e99e5df610f9b58f1a2ff4e529 Mon Sep 17 00:00:00 2001
From: Markus Metz <33666869+metzm@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:43:35 +0100
Subject: [PATCH] manual backport of #2842 (#2843)

---
 raster/r.cost/flag.c | 2 +-
 raster/r.cost/main.c | 4 ++--
 raster/r.walk/flag.c | 2 +-
 raster/r.walk/main.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/raster/r.cost/flag.c b/raster/r.cost/flag.c
index 8026a789c7e..c5dc98bfa58 100644
--- a/raster/r.cost/flag.c
+++ b/raster/r.cost/flag.c
@@ -21,7 +21,7 @@ FLAG *flag_create(int nrows, int ncols)
 	G_fatal_error(_("Out of memory!"));
 
     temp =
-	(unsigned char *)G_malloc(nrows * new_flag->leng *
+	(unsigned char *)G_malloc((size_t)nrows * new_flag->leng *
 				  sizeof(unsigned char));
 
     if (!temp)
diff --git a/raster/r.cost/main.c b/raster/r.cost/main.c
index 922aaba7df4..1ce27b957ab 100644
--- a/raster/r.cost/main.c
+++ b/raster/r.cost/main.c
@@ -517,7 +517,7 @@ int main(int argc, char *argv[])
 	costs.cost_out = dnullval;
 	costs.nearest = 0;
 
-	total_cells = nrows * ncols;
+	total_cells = (long)nrows * ncols;
 
 	skip_nulls = Rast_is_d_null_value(&null_cost);
 
@@ -809,7 +809,7 @@ int main(int argc, char *argv[])
      */
 
     G_debug(1, "total cells: %ld", total_cells);
-    G_debug(1, "nrows x ncols: %d", nrows * ncols);
+    G_debug(1, "nrows x ncols: %ld", (long)nrows * ncols);
     G_message(_("Finding cost path..."));
     n_processed = 0;
     visited = flag_create(nrows, ncols);
diff --git a/raster/r.walk/flag.c b/raster/r.walk/flag.c
index 8026a789c7e..c5dc98bfa58 100644
--- a/raster/r.walk/flag.c
+++ b/raster/r.walk/flag.c
@@ -21,7 +21,7 @@ FLAG *flag_create(int nrows, int ncols)
 	G_fatal_error(_("Out of memory!"));
 
     temp =
-	(unsigned char *)G_malloc(nrows * new_flag->leng *
+	(unsigned char *)G_malloc((size_t)nrows * new_flag->leng *
 				  sizeof(unsigned char));
 
     if (!temp)
diff --git a/raster/r.walk/main.c b/raster/r.walk/main.c
index 142dff6d3c7..bb444e9bdd0 100644
--- a/raster/r.walk/main.c
+++ b/raster/r.walk/main.c
@@ -645,7 +645,7 @@ int main(int argc, char *argv[])
 	costs.cost_out = dnullval;
 	costs.nearest = 0;
 
-	total_cells = nrows * ncols;
+	total_cells = (long)nrows * ncols;
 
 	skip_nulls = Rast_is_d_null_value(&null_cost);
 
@@ -960,7 +960,7 @@ int main(int argc, char *argv[])
      */
 
     G_debug(1, "total cells: %ld", total_cells);
-    G_debug(1, "nrows x ncols: %d", nrows * ncols);
+    G_debug(1, "nrows x ncols: %ld", (long)nrows * ncols);
     G_message(_("Finding cost path..."));
     n_processed = 0;
     visited = flag_create(nrows, ncols);