dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-05 08:26:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

webp: Fix imageio ReadPNM() TUPLTYPE

Browse Source 
It was colliding with "DEPTH" header value so ignoring "TUPLTYPE"
except for unhandled types.

Change-Id: I3c69cb6a81c5369e64b59d50567cd7fbc1756d57
This commit is contained in:
Yannis Guyon 2019-07-30 09:22:29 +02:00
parent fab8f9cfcf
commit 24d2ccb4e0
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
imageio/pnmdec.c
View File

@ -26,7 +26,7 @@ typedef enum {
DEPTH_FLAG = 1 << 2, DEPTH_FLAG = 1 << 2,
MAXVAL_FLAG = 1 << 3, MAXVAL_FLAG = 1 << 3,
TUPLE_FLAG = 1 << 4, TUPLE_FLAG = 1 << 4,
ALL_NEEDED_FLAGS = 0x1f ALL_NEEDED_FLAGS = WIDTH_FLAG | HEIGHT_FLAG | DEPTH_FLAG | MAXVAL_FLAG
} PNMFlags; } PNMFlags;
typedef struct { typedef struct {
@ -74,6 +74,7 @@ static size_t ReadPAMFields(PNMInfo* const info, size_t off) {
char out[MAX_LINE_SIZE + 1]; char out[MAX_LINE_SIZE + 1];
size_t out_size; size_t out_size;
int tmp; int tmp;
int expected_depth = -1;
assert(info != NULL); assert(info != NULL);
while (1) { while (1) {
off = ReadLine(info->data, off, info->data_size, out, &out_size); off = ReadLine(info->data, off, info->data_size, out, &out_size);
@ -95,13 +96,13 @@ static size_t ReadPAMFields(PNMInfo* const info, size_t off) {
info->seen_flags |= MAXVAL_FLAG; info->seen_flags |= MAXVAL_FLAG;
info->max_value = tmp; info->max_value = tmp;
} else if (!strcmp(out, "TUPLTYPE RGB_ALPHA")) { } else if (!strcmp(out, "TUPLTYPE RGB_ALPHA")) {
info->bytes_per_px = 4; expected_depth = 4;
info->seen_flags |= TUPLE_FLAG; info->seen_flags |= TUPLE_FLAG;
} else if (!strcmp(out, "TUPLTYPE RGB")) { } else if (!strcmp(out, "TUPLTYPE RGB")) {
info->bytes_per_px = 3; expected_depth = 3;
info->seen_flags |= TUPLE_FLAG; info->seen_flags |= TUPLE_FLAG;
} else if (!strcmp(out, "TUPLTYPE GRAYSCALE")) { } else if (!strcmp(out, "TUPLTYPE GRAYSCALE")) {
info->bytes_per_px = 1; expected_depth = 1;
info->seen_flags |= TUPLE_FLAG; info->seen_flags |= TUPLE_FLAG;
} else if (!strcmp(out, "ENDHDR")) { } else if (!strcmp(out, "ENDHDR")) {
break; break;
@ -116,17 +117,17 @@ static size_t ReadPAMFields(PNMInfo* const info, size_t off) {
return 0; return 0;
} }
} }
if (!(info->seen_flags & TUPLE_FLAG)) { if (!(info->seen_flags & ALL_NEEDED_FLAGS)) {
if (info->depth > 0 && info->depth <= 4 && info->depth != 2) { fprintf(stderr, "PAM header error: missing tags%s%s%s%s\n",
info->seen_flags |= TUPLE_FLAG; (info->seen_flags & WIDTH_FLAG) ? "" : " WIDTH",
info->bytes_per_px = info->depth * (info->max_value > 255 ? 2 : 1); (info->seen_flags & HEIGHT_FLAG) ? "" : " HEIGHT",
} else { (info->seen_flags & DEPTH_FLAG) ? "" : " DEPTH",
fprintf(stderr, "PAM: invalid bitdepth (%d).\n", info->depth); (info->seen_flags & MAXVAL_FLAG) ? "" : " MAXVAL");
return 0; return 0;
}
} }
if (info->seen_flags != ALL_NEEDED_FLAGS) { if (expected_depth != -1 && info->depth != expected_depth) {
fprintf(stderr, "PAM: incomplete header.\n"); fprintf(stderr, "PAM header error: expected DEPTH %d but got DEPTH %d\n",
expected_depth, info->depth);
return 0; return 0;
} }
return off; return off;
@ -160,16 +161,15 @@ static size_t ReadHeader(PNMInfo* const info) {
// finish initializing missing fields // finish initializing missing fields
info->depth = (info->type == 5) ? 1 : 3; info->depth = (info->type == 5) ? 1 : 3;
info->bytes_per_px = info->depth * (info->max_value > 255 ? 2 : 1);
} }
// perform some basic numerical validation // perform some basic numerical validation
if (info->width <= 0 || info->height <= 0 || if (info->width <= 0 || info->height <= 0 ||
info->type <= 0 || info->type >= 9 || info->type <= 0 || info->type >= 9 ||
info->depth <= 0 || info->depth == 2 || info->depth > 4 || info->depth <= 0 || info->depth == 2 || info->depth > 4 ||
info->bytes_per_px < info->depth ||
info->max_value <= 0 || info->max_value >= 65536) { info->max_value <= 0 || info->max_value >= 65536) {
return 0; return 0;
} }
info->bytes_per_px = info->depth * (info->max_value > 255 ? 2 : 1);
return off; return off;
} }