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

Add a NULL check before before strcmp'ing 

The names array can have NULL entries for some virtual modifier indexes.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-04-01 16:51:48 +03:00 committed by Daniel Stone
parent 9813778e73
commit 84ec6b61a7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xkbcomp/vmod.c
View File

@ -242,7 +242,8 @@ ResolveVirtualModifier(ExprDef * def, struct xkb_desc *xkb,
const char *name = XkbcAtomText(def->value.str); const char *name = XkbcAtomText(def->value.str);
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
{ {
if ((info->available & bit) && strcmp(names->vmods[i], name) == 0) if ((info->available & bit) && names->vmods[i] &&
strcmp(names->vmods[i], name) == 0)
{ {
val_rtrn->uval = i; val_rtrn->uval = i;
return True; return True;