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

keycodes: don't try to copy zero key aliases 

Move the aliases copy to within the (num_key_aliases > 0) block.

Passing info->aliases into this fuction with invalid aliases will
cause log messages but num_key_aliases stays on 0. The key_aliases array
is never allocated and remains NULL. We then loop through the aliases, causing
a null-pointer dereference.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
master
Peter Hutterer 2018-07-23 11:48:35 +10:00
parent 9045b03598
commit badb428e63
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xkbcomp/keycodes.c
View File

@ -596,14 +596,14 @@ CopyKeyAliasesToKeymap(struct xkb_keymap *keymap, KeyNamesInfo *info)
key_aliases = calloc(num_key_aliases, sizeof(*key_aliases)); key_aliases = calloc(num_key_aliases, sizeof(*key_aliases));
if (!key_aliases) if (!key_aliases)
return false; return false;
}
i = 0; i = 0;
darray_foreach(alias, info->aliases) { darray_foreach(alias, info->aliases) {
if (alias->real != XKB_ATOM_NONE) { if (alias->real != XKB_ATOM_NONE) {
key_aliases[i].alias = alias->alias; key_aliases[i].alias = alias->alias;
key_aliases[i].real = alias->real; key_aliases[i].real = alias->real;
i++; i++;
}
} }
} }