From ba4177c6ca5b263f99405fc9ce30122a365cbf9b Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Wed, 25 Sep 2024 15:51:57 -0400 Subject: [PATCH 01/10] Fix Resource Leak --- imagery/i.ortho.photo/lib/find_init.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 906203a7f90..6bbc5330ab8 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -8,11 +8,16 @@ int I_find_initial(char *group) { char *element; + int file_exists; element = (char *)G_malloc(80 * sizeof(char)); - if (group == NULL || *group == 0) + if (group == NULL || *group == 0) { + G_free(element); return 0; + } sprintf(element, "group/%s", group); - return G_find_file(element, "INIT_EXP", G_mapset()) != NULL; + file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; + G_free(element); + return file_exists; } From 5c9af6536c019ac7ed6c9adc53af2cce37cce3ae Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Wed, 25 Sep 2024 16:12:54 -0400 Subject: [PATCH 02/10] changes --- imagery/i.ortho.photo/lib/find_init.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 6bbc5330ab8..6336cf38ff5 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -10,12 +10,13 @@ int I_find_initial(char *group) char *element; int file_exists; - element = (char *)G_malloc(80 * sizeof(char)); - if (group == NULL || *group == 0) { - G_free(element); return 0; } + + element = (char *)G_malloc(80 * sizeof(char)); + + sprintf(element, "group/%s", group); file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; G_free(element); From 3beeca98a74583730bd0f346d9d37d6c7f98430b Mon Sep 17 00:00:00 2001 From: ShubhamDesai <42180509+ShubhamDesai@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:15:24 -0400 Subject: [PATCH 03/10] Update imagery/i.ortho.photo/lib/find_init.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- imagery/i.ortho.photo/lib/find_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 6336cf38ff5..93da38d79f1 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -16,7 +16,6 @@ int I_find_initial(char *group) element = (char *)G_malloc(80 * sizeof(char)); - sprintf(element, "group/%s", group); file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; G_free(element); From 2a5514fb6bd3ce594f960a0f3aad10751757ad63 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Wed, 25 Sep 2024 16:20:29 -0400 Subject: [PATCH 04/10] snprintf --- imagery/i.ortho.photo/lib/find_init.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 6336cf38ff5..588d0303b9d 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -5,6 +5,8 @@ **************************************************************/ #include +#define ELEMENT_BUFFER_SIZE 80 + int I_find_initial(char *group) { char *element; @@ -14,10 +16,9 @@ int I_find_initial(char *group) return 0; } - element = (char *)G_malloc(80 * sizeof(char)); + element = (char *)G_malloc(ELEMENT_BUFFER_SIZE * sizeof(char)); - - sprintf(element, "group/%s", group); + snprintf(element, ELEMENT_BUFFER_SIZE, "group/%s", group); file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; G_free(element); return file_exists; From 752871e01f1b45be232d5a6e0fdace9f24c7a962 Mon Sep 17 00:00:00 2001 From: ShubhamDesai <42180509+ShubhamDesai@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:23:46 -0400 Subject: [PATCH 05/10] Update imagery/i.ortho.photo/lib/find_init.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- imagery/i.ortho.photo/lib/find_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 27f570617f9..588d0303b9d 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -19,7 +19,6 @@ int I_find_initial(char *group) element = (char *)G_malloc(ELEMENT_BUFFER_SIZE * sizeof(char)); snprintf(element, ELEMENT_BUFFER_SIZE, "group/%s", group); - file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; G_free(element); return file_exists; From 8fafb4897d75a9a336ab2c2ee46cf3fc070b778a Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Wed, 25 Sep 2024 17:50:52 -0400 Subject: [PATCH 06/10] GNAME_MAX --- imagery/i.ortho.photo/lib/find_init.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 27f570617f9..71ac160f596 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -5,20 +5,17 @@ **************************************************************/ #include -#define ELEMENT_BUFFER_SIZE 80 - int I_find_initial(char *group) { char *element; int file_exists; - if (group == NULL || *group == 0) { + if (group == NULL || *group == 0) return 0; - } - element = (char *)G_malloc(ELEMENT_BUFFER_SIZE * sizeof(char)); + element = (char *)G_malloc(GNAME_MAX * sizeof(char)); - snprintf(element, ELEMENT_BUFFER_SIZE, "group/%s", group); + snprintf(element, GNAME_MAX, "group/%s", group); file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; G_free(element); From b7f304055a5943800690a4225c9b444286a406ef Mon Sep 17 00:00:00 2001 From: ShubhamDesai <42180509+ShubhamDesai@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:56:03 -0400 Subject: [PATCH 07/10] Update imagery/i.ortho.photo/lib/find_init.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- imagery/i.ortho.photo/lib/find_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 71ac160f596..8b44c049915 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -16,7 +16,6 @@ int I_find_initial(char *group) element = (char *)G_malloc(GNAME_MAX * sizeof(char)); snprintf(element, GNAME_MAX, "group/%s", group); - file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; G_free(element); return file_exists; From de2f5770e4731875bc28a4701c0dd0be2ad78702 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Tue, 1 Oct 2024 21:56:26 -0400 Subject: [PATCH 08/10] requested changes --- imagery/i.ortho.photo/lib/find_init.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 71ac160f596..dfee98aeae2 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -7,17 +7,17 @@ int I_find_initial(char *group) { - char *element; + char element[GNAME_MAX]; int file_exists; if (group == NULL || *group == 0) return 0; - element = (char *)G_malloc(GNAME_MAX * sizeof(char)); - - snprintf(element, GNAME_MAX, "group/%s", group); + if (snprintf(element, GNAME_MAX, "group/%s", group) >= GNAME_MAX) { + G_warning("Group name truncated"); + return 0; + } file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; - G_free(element); return file_exists; } From b77a09d8101d5966c9306477432b48090fe837f2 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Fri, 11 Oct 2024 16:26:52 -0400 Subject: [PATCH 09/10] requested changes --- imagery/i.ortho.photo/lib/find_init.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index d61923761cf..500549a3b46 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -4,20 +4,19 @@ * Find the a camera initial file in the current group (if it exists) **************************************************************/ #include +#include int I_find_initial(char *group) { - char element[GNAME_MAX]; - int file_exists; + char element[GNAME_MAX + 6]; if (group == NULL || *group == 0) return 0; if (snprintf(element, GNAME_MAX, "group/%s", group) >= GNAME_MAX) { - G_warning("Group name truncated"); + G_warning(_("Group name <%s> truncated"), group); return 0; } - file_exists = G_find_file(element, "INIT_EXP", G_mapset()) != NULL; - return file_exists; + return G_find_file(element, "INIT_EXP", G_mapset()) != NULL; } From 1261d70438eb5f7d49e07aba290e99622355d6d4 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Fri, 11 Oct 2024 18:23:49 -0400 Subject: [PATCH 10/10] message --- imagery/i.ortho.photo/lib/find_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imagery/i.ortho.photo/lib/find_init.c b/imagery/i.ortho.photo/lib/find_init.c index 500549a3b46..f8cea9b9387 100644 --- a/imagery/i.ortho.photo/lib/find_init.c +++ b/imagery/i.ortho.photo/lib/find_init.c @@ -14,7 +14,7 @@ int I_find_initial(char *group) return 0; if (snprintf(element, GNAME_MAX, "group/%s", group) >= GNAME_MAX) { - G_warning(_("Group name <%s> truncated"), group); + G_warning(_("Group name <%s> is too long"), group); return 0; }