Skip to content

lib/raster: guard compressed row memcpy size #8015

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

Merged
echoix merged 2 commits into from
Oct 11, 2026
Merged

lib/raster: guard compressed row memcpy size #8015

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36cc2f
grass/raster: guard compressed row memcpy size
nilason Oct 4, 2026
8059275
check 'n > fcb->nbytes', according to review suggestion
nilason Oct 4, 2026
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
22 changes: 17 additions & 5 deletions lib/raster/get_row.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,22 +171,29 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf,

/* Now decompress the row */
if (fcb->cellhd.compressed > 0) {
if (readamount == 0) {
if (readamount < 1) {
G_free(cmp2);
G_fatal_error(_("Error reading raster data for row %d of <%s>"),
row, fcb->name);
}

/* one byte is nbyte count */
n = *nbytes = *cmp++;
readamount--;
readamount -= 1;

if (n > fcb->nbytes) {
G_free(cmp2);
G_fatal_error(
_("Invalid byte count in raster data for row %d of <%s>"), row,
fcb->name);
}
}
else
/* pre 3.0 compression */
n = *nbytes = fcb->nbytes;

bufsize = (size_t)n * fcb->cellhd.cols;
if (fcb->cellhd.compressed < 0 || (size_t)readamount < bufsize) {
if (fcb->cellhd.compressed < 0 || readamount < bufsize) {
if (fcb->cellhd.compressed == 1)
rle_decompress(data_buf, cmp, n, readamount);
else {
Expand All @@ -203,8 +210,13 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf,
}
}
}
else
memcpy(data_buf, cmp, readamount);
else {
if (readamount > bufsize)
G_fatal_error(_("Raster row for <%s> is larger than expected"),
fcb->name);

memcpy(data_buf, cmp, bufsize);
}

G_free(cmp2);
}
Expand Down
Loading