Miroirs/libdisplay-info
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/emersion/libdisplay-info.git synced 2024-12-25 21:59:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

edid: Record failures instead of aborting parsing

Browse source 
Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>
This commit is contained in:
Sebastian Wick 2024-05-06 18:28:22 +02:00
parent f48cc61166
commit 5741163901
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
edid.c
View file

@ -1198,13 +1198,11 @@ _di_edid_parse(const void *data, size_t size, FILE *failure_msg_file)
struct di_edid *edid; struct di_edid *edid;
struct di_logger logger; struct di_logger logger;
int version, revision; int version, revision;
size_t exts_len, i; size_t exts_len, parsed_ext_len, i;
const uint8_t *standard_timing_data, *byte_desc_data, *ext_data; const uint8_t *standard_timing_data, *byte_desc_data, *ext_data;
struct di_edid_standard_timing *standard_timing; struct di_edid_standard_timing *standard_timing;
if (size < EDID_BLOCK_SIZE || if (size < EDID_BLOCK_SIZE) {
size > EDID_MAX_BLOCK_COUNT * EDID_BLOCK_SIZE ||
size % EDID_BLOCK_SIZE != 0) {
errno = EINVAL; errno = EINVAL;
return NULL; return NULL;
} }
@ -1227,12 +1225,6 @@ _di_edid_parse(const void *data, size_t size, FILE *failure_msg_file)
return NULL; return NULL;
} }
exts_len = size / EDID_BLOCK_SIZE - 1;
if (exts_len != parse_ext_count(data)) {
errno = EINVAL;
return NULL;
}
edid = calloc(1, sizeof(*edid)); edid = calloc(1, sizeof(*edid));
if (!edid) { if (!edid) {
return NULL; return NULL;
@ -1247,6 +1239,22 @@ _di_edid_parse(const void *data, size_t size, FILE *failure_msg_file)
edid->version = version; edid->version = version;
edid->revision = revision; edid->revision = revision;
if (size % EDID_BLOCK_SIZE != 0)
add_failure(edid, "The data is not a multiple of the block size.");
if (size > EDID_MAX_BLOCK_COUNT * EDID_BLOCK_SIZE)
add_failure(edid, "The data is exceeding the maximum block count.");
exts_len = (size / EDID_BLOCK_SIZE) - 1;
parsed_ext_len = parse_ext_count(data);
if (exts_len != parsed_ext_len)
add_failure(edid, "The data size does not match the encoded block count.");
if (parsed_ext_len < exts_len)
exts_len = parsed_ext_len;
assert(exts_len < EDID_MAX_BLOCK_COUNT);
parse_vendor_product(edid, data); parse_vendor_product(edid, data);
parse_basic_params_features(edid, data); parse_basic_params_features(edid, data);
parse_chromaticity_coords(edid, data); parse_chromaticity_coords(edid, data);