StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compose: fix max compose nodes check 

Signed-off-by: Ran Benita <ran@unusedvar.com>
master
Ran Benita 2021-04-02 15:00:46 +03:00
parent 45b1ca2205
commit 7e6d942a4f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compose/parser.c
View File

@ -336,9 +336,10 @@ add_production(struct xkb_compose_table *table, struct scanner *s,
uint16_t *pptr = NULL;
struct compose_node *node = NULL;
if (darray_size(table->nodes) + 1 == MAX_COMPOSE_NODES)
/* Warn before potentially going over the limit, discard silently after. */
if (darray_size(table->nodes) + production->len + MAX_LHS_LEN > MAX_COMPOSE_NODES)
scanner_warn(s, "too many sequences for one Compose file; will ignore further lines");
if (darray_size(table->nodes) >= MAX_COMPOSE_NODES)
if (darray_size(table->nodes) + production->len >= MAX_COMPOSE_NODES)
return;
/*