From 6719952c839ca2bb1e76dd1016a0b46fb354fe49 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Mon, 28 Jul 2025 09:01:26 -0400 Subject: [PATCH 1/5] Fix COpy fix buffer size issues --- display/d.vect/legend.c | 4 +++- display/d.vect/main.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/display/d.vect/legend.c b/display/d.vect/legend.c index d522332babc..a3148ae1773 100644 --- a/display/d.vect/legend.c +++ b/display/d.vect/legend.c @@ -13,7 +13,9 @@ void write_into_legfile(struct Map_info *Map, int type, const char *leglab, char *leg_file; char map[GNAME_MAX]; char *ptr; - strcpy(map, name_map); + if (G_strlcpy(map, name_map, sizeof(map)) >= sizeof(map)) { + G_fatal_error(_("Map name <%s> is too long"), name_map); + } #ifdef _MSC_VER strtok_s(map, "@", &ptr); #else diff --git a/display/d.vect/main.c b/display/d.vect/main.c index 265357a1ee7..2e8dac1031e 100644 --- a/display/d.vect/main.c +++ b/display/d.vect/main.c @@ -362,7 +362,9 @@ int main(int argc, char **argv) } } - strcpy(map_name, map_opt->answer); + if (G_strlcpy(map_name, map_opt->answer, sizeof(map_name)) >= sizeof(map_name)) { + G_fatal_error(_("Map name <%s> is too long"), map_opt->answer); + } default_width = atoi(width_opt->answer); if (default_width < 0) From 02cb989b936721fe4998395c7beaa393e5e26112 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Mon, 28 Jul 2025 09:04:57 -0400 Subject: [PATCH 2/5] add glocale --- display/d.vect/legend.c | 1 + 1 file changed, 1 insertion(+) diff --git a/display/d.vect/legend.c b/display/d.vect/legend.c index a3148ae1773..58591361ff2 100644 --- a/display/d.vect/legend.c +++ b/display/d.vect/legend.c @@ -1,4 +1,5 @@ #include +#include #include #include "local_proto.h" From a1277badfd7134951a69df5d0c6aa7014e339d5e Mon Sep 17 00:00:00 2001 From: ShubhamDesai <42180509+ShubhamDesai@users.noreply.github.com> Date: Mon, 28 Jul 2025 11:20:32 -0400 Subject: [PATCH 3/5] Update display/d.vect/main.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- display/d.vect/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/display/d.vect/main.c b/display/d.vect/main.c index 2e8dac1031e..27340fe741e 100644 --- a/display/d.vect/main.c +++ b/display/d.vect/main.c @@ -362,7 +362,8 @@ int main(int argc, char **argv) } } - if (G_strlcpy(map_name, map_opt->answer, sizeof(map_name)) >= sizeof(map_name)) { + if (G_strlcpy(map_name, map_opt->answer, sizeof(map_name)) >= + sizeof(map_name)) { G_fatal_error(_("Map name <%s> is too long"), map_opt->answer); } From 4bf9ee4f8c75baa819951e6d6ce4a387160b1248 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Wed, 30 Jul 2025 19:15:32 -0400 Subject: [PATCH 4/5] Trigger CI From a6f5dd7f9be6221fb4f87bf06fd325afcfb288ab Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Wed, 30 Jul 2025 19:19:07 -0400 Subject: [PATCH 5/5] Trigger CI