From 84ec6b61a76a753f72eecec825fd0736d5b0070c Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sun, 1 Apr 2012 16:51:48 +0300 Subject: [PATCH] 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 --- src/xkbcomp/vmod.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c index 799185d..1a9d43d 100644 --- a/src/xkbcomp/vmod.c +++ b/src/xkbcomp/vmod.c @@ -242,7 +242,8 @@ ResolveVirtualModifier(ExprDef * def, struct xkb_desc *xkb, const char *name = XkbcAtomText(def->value.str); 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; return True; -- 2.7.4