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

symbols: avoid possible access-out-of-bound due to explicit_group 

The code that handles group name statements currently does this:
    info->group_names[grp - 1 + info->explicit_group] = name;
Other than the fact that this addition makes no sense, it actually can
reach out of the bounds of the array (which is of size XKB_NUM_GROUPS)
in the (non-realistic) case where (grp - 1) is not 0 (i.e. the statement
is not name[Group1] = "foo").

We also change explicit_group to be XKB_LAYOUT_INVALID if not set
otherwise, instead of initializing it to 0; this is clearer and if
someone happens to write 'us:1' for some reason, it will discard the
other groups in the file as it should.

This entire explicit_group thing was clearly bolted on as an
afterthought.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-09-23 21:15:34 +02:00 committed by Daniel Stone
parent 6d97d0ce5e
commit 79bbf6f758
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/xkbcomp/symbols.c
View File

@ -184,6 +184,7 @@ InitSymbolsInfo(SymbolsInfo *info, struct xkb_keymap *keymap,
InitKeyInfo(&info->dflt, file_id); InitKeyInfo(&info->dflt, file_id);
InitVModInfo(&info->vmods, keymap); InitVModInfo(&info->vmods, keymap);
info->actions = actions; info->actions = actions;
info->explicit_group = XKB_LAYOUT_INVALID;
} }
static void static void
@ -1056,7 +1057,18 @@ SetGroupName(SymbolsInfo *info, ExprDef *arrayNdx, ExprDef *value)
return false; return false;
} }
info->group_names[grp - 1 + info->explicit_group] = name; if (info->explicit_group == XKB_LAYOUT_INVALID)
info->group_names[grp - 1] = name;
else if (grp - 1 == 0)
info->group_names[info->explicit_group] = name;
else
log_warn(info->keymap->ctx,
"An explicit group was specified for the '%s' map, "
"but it provides a name for a group other than Group1 (%d); "
"Ignoring group name '%s'\n",
info->name, grp,
xkb_atom_text(info->keymap->ctx, name));
return true; return true;
} }
@ -1151,7 +1163,7 @@ SetExplicitGroup(SymbolsInfo *info, KeyInfo *keyi)
GroupInfo *groupi; GroupInfo *groupi;
bool warn = false; bool warn = false;
if (info->explicit_group == 0) if (info->explicit_group == XKB_LAYOUT_INVALID)
return true; return true;
darray_enumerate_from(i, groupi, keyi->groups, 1) { darray_enumerate_from(i, groupi, keyi->groups, 1) {
@ -1169,9 +1181,12 @@ SetExplicitGroup(SymbolsInfo *info, KeyInfo *keyi)
info->name, LongKeyNameText(keyi->name)); info->name, LongKeyNameText(keyi->name));
darray_resize0(keyi->groups, info->explicit_group + 1); darray_resize0(keyi->groups, info->explicit_group + 1);
darray_item(keyi->groups, info->explicit_group) = if (info->explicit_group > 0) {
darray_item(keyi->groups, 0); darray_item(keyi->groups, info->explicit_group) =
InitGroupInfo(&darray_item(keyi->groups, 0)); darray_item(keyi->groups, 0);
InitGroupInfo(&darray_item(keyi->groups, 0));
}
return true; return true;
} }