xkbcomp: Give keymap file empty name if none supplied

Ensure that the keymap file topName is not NULL since it gets blindly dereferenced later.
2009-04-04 12:31:55 -07:00 · 2009-04-04 12:31:55 -07:00 · 85039a0d76
parent 125ce76f5b
commit 85039a0d76
1 changed files with 2 additions and 1 deletions
--- a/src/xkbcomp/xkbcomp.c
+++ b/src/xkbcomp/xkbcomp.c
@ -72,7 +72,8 @@ XkbKeymapFileFromComponents(const XkbComponentNamesPtr ktcsg)
    geometry = CreateXKBFile(XkmGeometryIndex, NULL, (ParseCommon *)inc, 0);
    AppendStmt(&keycodes->common, &geometry->common);

-    return CreateXKBFile(XkmKeymapFile, ktcsg->keymap, &keycodes->common, 0);
+    return CreateXKBFile(XkmKeymapFile, ktcsg->keymap ? ktcsg->keymap : "",
+                         &keycodes->common, 0);
 }

 static XkbComponentNamesPtr