Commit 1e52bf79951855914057d289e84aed1d98c2b331
2013-10-03T10:02:49
symbols: fix use of uninitialized variable 'tmp' is stack allocated so tmp->merge is used uninitialized by AddModMapEntry(). The value doesn't matter much, but it used to make some modmap merging decision (which doesn't have many conflicts usually). Bug inherited from xkbcomp. Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 63fea1a..71435c6 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -1196,6 +1196,7 @@ HandleModMapDef(SymbolsInfo *info, ModMapDef *def)
ok = true;
tmp.modifier = ndx;
+ tmp.merge = def->merge;
for (key = def->keys; key != NULL; key = (ExprDef *) key->common.next) {
xkb_keysym_t sym;