1 files changed, 1 insertions, 10 deletions
diff --git a/xkb/xkb.c b/xkb/xkb.c
index d701ea13c..fb44b24e9 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5895,16 +5895,7 @@ ProcXkbGetKbdByName(ClientPtr client)
 	XkbFreeKeyboard(new,XkbAllComponentsMask,TRUE);
 	new= NULL;
     }
-    free(names.keycodes);
-    names.keycodes = NULL;
-    free(names.types);
-    names.types = NULL;
-    free(names.compat);
-    names.compat = NULL;
-    free(names.symbols);
-    names.symbols = NULL;
-    free(names.geometry);
-    names.geometry = NULL;
+    XkbFreeComponentNames(&names, FALSE);
     return Success;
 }