Skip to content

Commit

Permalink
r.kappa: Copy into fix buffer size issue (#5203)
Browse files Browse the repository at this point in the history
  • Loading branch information
ShubhamDesai authored Feb 25, 2025
1 parent 9ee21ec commit 107a467
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion raster/r.kappa/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ static void layer(const char *s)
const char *mapset;
int n;

strcpy(name, s);
if (G_strlcpy(name, s, sizeof(name)) >= sizeof(name)) {
G_fatal_error(_("Raster map name <%s> is too long"), s);
}
if ((mapset = G_find_raster2(name, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), s);

Expand Down
8 changes: 6 additions & 2 deletions raster/r.kappa/stats.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,16 @@ int stats(void)
const char *argv[9];
int argc = 0;

strcpy(mname, maps[1]);
if (G_strlcpy(mname, maps[1], sizeof(mname)) >= sizeof(mname)) {
G_fatal_error(_("Raster map name <%s> is too long"), maps[1]);
}
mmapset = G_find_raster2(mname, "");
if (mmapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), maps[0]);

strcpy(rname, maps[0]);
if (G_strlcpy(rname, maps[0], sizeof(rname)) >= sizeof(rname)) {
G_fatal_error(_("Raster map name <%s> is too long"), maps[0]);
}
rmapset = G_find_raster2(rname, "");
if (rmapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), maps[1]);
Expand Down

0 comments on commit 107a467

Please sign in to comment.