1
mirror of https://github.com/mpv-player/mpv synced 2024-11-14 22:48:35 +01:00

m_config: check for int16_t offset overflow

For some reason shadow_offset is a int16_t variable (to save some space
or something), which means the static part of the entire option list
must be below 32KB. This is fine, but still add a check against
overflows. (Currently it's 3.6KB. This does not include dynamic
allocations like strings.)
This commit is contained in:
wm4 2018-05-20 13:38:54 +02:00
parent 4e9166f22d
commit 246a828c26

View File

@ -525,7 +525,9 @@ static void m_config_add_option(struct m_config *config,
// The required alignment is unknown, so go with the maximum C // The required alignment is unknown, so go with the maximum C
// could require. Slightly wasteful, but not that much. // could require. Slightly wasteful, but not that much.
int align = (size - config->shadow_size % size) % size; int align = (size - config->shadow_size % size) % size;
co.shadow_offset = config->shadow_size + align; int offset = config->shadow_size + align;
assert(offset <= INT16_MAX);
co.shadow_offset = offset;
config->shadow_size = co.shadow_offset + size; config->shadow_size = co.shadow_offset + size;
} }