Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

i.ortho.photo: Fix uninitialized variable and potential buffer overflow #4093

Merged
merged 9 commits into from
Aug 2, 2024
Merged

i.ortho.photo: Fix uninitialized variable and potential buffer overflow #4093

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0a94ba7
i.ortho.photo: Fix uninitialized variable issue in menu.c
Jul 23, 2024
721430e
strncpy changes updated
Jul 24, 2024
298ea62
use G_strlcpy
Jul 30, 2024
39b7578
requested changes
Aug 1, 2024
be6a211
Update imagery/i.ortho.photo/i.ortho.photo/menu.c
ShubhamDesai Aug 2, 2024
da77cb3
Update imagery/i.ortho.photo/i.ortho.photo/menu.c
ShubhamDesai Aug 2, 2024
a2eb82e
Update imagery/i.ortho.photo/i.ortho.photo/menu.c
ShubhamDesai Aug 2, 2024
89e2c6c
requested changes
Aug 2, 2024
fc8d45c
requested changes
Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions imagery/i.ortho.photo/i.ortho.photo/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include <grass/spawn.h>
#include "orthophoto.h"

#define BUFFER_SIZE 99

int main(int argc, char **argv)
{
char *p;
Expand All @@ -33,7 +35,8 @@ int main(int argc, char **argv)
char *desc_ortho_opt;
char *moduletorun;
const char *grname;
char tosystem[99];
char tosystem[BUFFER_SIZE] = "";
size_t len;

/* initialize grass */
G_gisinit(argv[0]);
Expand Down Expand Up @@ -82,8 +85,10 @@ int main(int argc, char **argv)
/* group validity check */

/*----------------------*/
strncpy(group.name, group_opt->answer, 99);
group.name[99] = '\0';
len = G_strlcpy(group.name, group_opt->answer, BUFFER_SIZE);
if (len >= BUFFER_SIZE) {
G_fatal_error(_("Name <%s> is too long"), group_opt->answer);
}
/* strip off mapset if it's there: I_() fns only work with current mapset */
if ((p = strchr(group.name, '@')))
*p = 0;
Expand All @@ -96,26 +101,26 @@ int main(int argc, char **argv)
moduletorun = ortho_opt->answer;
/* run the program chosen */
if (strcmp(moduletorun, "g.gui.photo2image") == 0) {
strcpy(tosystem, "g.gui.photo2image");
(void)G_strlcpy(tosystem, "g.gui.photo2image", BUFFER_SIZE);
return system((const char *)tosystem);
}
else if (strcmp(moduletorun, "g.gui.image2target") == 0) {
strcpy(tosystem, "g.gui.image2target");
(void)G_strlcpy(tosystem, "g.gui.image2target", BUFFER_SIZE);
return system((const char *)tosystem);
}
else {
if (strcmp(moduletorun, "i.group") == 0)
strcpy(tosystem, "i.group --ui group=");
(void)G_strlcpy(tosystem, "i.group --ui group=", BUFFER_SIZE);
if (strcmp(moduletorun, "i.ortho.target") == 0)
strcpy(tosystem, "i.ortho.target --ui group=");
(void)G_strlcpy(tosystem, "i.ortho.target --ui group=", BUFFER_SIZE);
ShubhamDesai marked this conversation as resolved.
Show resolved Hide resolved
if (strcmp(moduletorun, "i.ortho.elev") == 0)
strcpy(tosystem, "i.ortho.elev --ui group=");
(void)G_strlcpy(tosystem, "i.ortho.elev --ui group=", BUFFER_SIZE);
if (strcmp(moduletorun, "i.ortho.camera") == 0)
strcpy(tosystem, "i.ortho.camera --ui group=");
(void)G_strlcpy(tosystem, "i.ortho.camera --ui group=", BUFFER_SIZE);
ShubhamDesai marked this conversation as resolved.
Show resolved Hide resolved
if (strcmp(moduletorun, "i.ortho.init") == 0)
strcpy(tosystem, "i.ortho.init --ui group=");
(void)G_strlcpy(tosystem, "i.ortho.init --ui group=", BUFFER_SIZE);
if (strcmp(moduletorun, "i.ortho.rectify") == 0)
strcpy(tosystem, "i.ortho.rectify --ui group=");
(void)G_strlcpy(tosystem, "i.ortho.rectify --ui group=", BUFFER_SIZE);
ShubhamDesai marked this conversation as resolved.
Show resolved Hide resolved
strcat(tosystem, grname);
return system((const char *)tosystem);
}
Expand Down
Loading