Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixes for reading malformed/truncated PAM files #532

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
jonsneyers merged 1 commit into from
Sep 3, 2021
Merged

Fixes for reading malformed/truncated PAM files #532

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 deletions src/image/image-pam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ bool image_load_pam_fp(FILE *fp, Image& image) {
#ifndef SUPPORT_HDR
if (maxval > 0xff) {
e_printf("PAM file has more than 8 bit per channel, this FLIF cannot handle that.\n");
fclose(fp);
return false;
}
#endif
Expand All @@ -78,8 +79,16 @@ bool image_load_pam_fp(FILE *fp, Image& image) {
for (unsigned int y=0; y<height; y++) {
for (unsigned int x=0; x<width; x++) {
for (unsigned int c=0; c<nbplanes; c++) {
ColorVal pixel= (fgetc(fp) << 8);
pixel += fgetc(fp);
int msb = fgetc(fp);
int lsb = fgetc(fp);
if (msb == EOF || lsb == EOF) {
e_printf("PAM file has insufficient data.\n");
fclose(fp);
return false;
}
ColorVal pixel = (msb << 8) + lsb;
if (pixel > maxval)
pixel = maxval;
image.set(c,y,x, pixel);
}
}
Expand All @@ -88,7 +97,15 @@ bool image_load_pam_fp(FILE *fp, Image& image) {
for (unsigned int y=0; y<height; y++) {
for (unsigned int x=0; x<width; x++) {
for (unsigned int c=0; c<nbplanes; c++) {
image.set(c,y,x, fgetc(fp));
int pixel = fgetc(fp);
if (pixel == EOF) {
e_printf("PAM file has insufficient data.\n");
fclose(fp);
return false;
}
if (pixel > maxval)
pixel = maxval;
image.set(c,y,x, pixel);
}
}
}
Expand Down