xkb: fix uninitialized variables in XkmReadFile()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

xkb/ddxLoad.c

@@ -389,7 +389,7 @@ XkbDDXLoadKeymapByNames(DeviceIntPtr keybd,
         (names->compat == NULL) && (names->symbols == NULL) &&
         (names->geometry == NULL)) {
         LogMessage(X_ERROR, "XKB: No components provided for device %s\n",
-                   keybd->name ? keybd->name : "(unnamed keyboard)");
+                   keybd && keybd->name ? keybd->name : "(unnamed keyboard)");
         return 0;
     }
     else if (!XkbDDXCompileKeymapByNames(xkb, names, want, need,

xkb/maprules.c

@@ -93,7 +93,9 @@ InputLineAddChar(InputLine * line, int ch)
 {
     if (line->num_line >= line->sz_line) {
         if (line->line == line->buf) {
-            line->line = xallocarray(line->sz_line, 2);
+            line->line = calloc(line->sz_line, 2);
+            if (line->line == NULL)
+                return -1;
             memcpy(line->line, line->buf, line->sz_line);
         }
         else {
@@ -379,7 +381,7 @@ CheckLine(InputLine * line,
     _Xstrtokparams strtok_buf;
     Bool append = FALSE;
 
-    if (line->line[0] == '!') {
+    if (line && line->line && line->line[0] == '!') {
         if (line->line[1] == '$' ||
             (line->line[1] == ' ' && line->line[2] == '$')) {
             char *gname = strchr(line->line, '$');

xkb/xkmread.c

@@ -1209,7 +1209,7 @@ unsigned
 XkmReadFile(FILE * file, unsigned need, unsigned want, XkbDescPtr *xkb)
 {
     register unsigned i;
-    xkmSectionInfo toc[MAX_TOC], tmpTOC;
+    xkmSectionInfo toc[MAX_TOC] = { 0 }, tmpTOC = { 0 };
     xkmFileInfo fileInfo;
     unsigned tmp, nRead = 0;
     unsigned which = need | want;