Miroirs/libdisplay-info
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/emersion/libdisplay-info.git synced 2024-11-16 19:48:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

edid: check extension block count field

Browse source 
The ensures the EDID hasn't been truncated.

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2022-05-25 17:32:25 +02:00
parent 64d148d2b2
commit 350e557c3f
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
edid.c
View file

@ -28,6 +28,12 @@ parse_version_revision(const uint8_t data[static EDID_BLOCK_SIZE],
*revision = (int) data[0x13];
}
static size_t
parse_ext_count(const uint8_t data[static EDID_BLOCK_SIZE])
{
return data[0x7E];
}
static bool
validate_block_checksum(const uint8_t data[static EDID_BLOCK_SIZE])
{
@ -146,6 +152,12 @@ di_edid_parse(const void *data, size_t size)
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));
if (!edid) {
return NULL;
@ -156,7 +168,6 @@ di_edid_parse(const void *data, size_t size)
parse_vendor_product(data, &edid->vendor_product);
exts_len = size / EDID_BLOCK_SIZE - 1;
edid->exts = calloc(exts_len + 1, sizeof(struct di_edid_ext *));
if (!edid->exts) {
di_edid_destroy(edid);