PrintModifierMapping: stop leaking the map returned by XGetKeyboardMapping

Resolves issue reported by Oracle Parfait static analyzer:

Error: Memory leak
   Memory leak [memory-leak] (CWE 401):
      Memory leak of pointer pointer allocated with XGetKeyboardMapping(...)
        at line 251 of app/xmodmap/exec.c in function 'PrintModifierMapping'.
          pointer allocated at line 222 with XGetKeyboardMapping(...)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 17 insertions, 10 deletions

diff --git a/exec.c b/exec.c
index a7249ca..63817ad 100644
--- a/exec.c
+++ b/exec.c
@@ -208,6 +208,18 @@ ClearModifier(XModifierKeymap **mapp, int modifier)
     return (0);
 }
 
+static int
+GetKeysymsPerKeycode(void)
+{
+    int min_keycode, max_keycode, keysyms_per_keycode = 0;
+    KeySym *m;
+
+    XDisplayKeycodes(dpy, &min_keycode, &max_keycode);
+    m = XGetKeyboardMapping(dpy, min_keycode, (max_keycode - min_keycode + 1),
+                            &keysyms_per_keycode);
+    XFree(m);
+    return keysyms_per_keycode;
+}
 
 /*
  * print the contents of the map
@@ -215,21 +227,16 @@ ClearModifier(XModifierKeymap **mapp, int modifier)
 void
 PrintModifierMapping(XModifierKeymap *map, FILE *fp)
 {
-    int i, k = 0;
-    int min_keycode, max_keycode, keysyms_per_keycode = 0;
-
-    XDisplayKeycodes (dpy, &min_keycode, &max_keycode);
-    XGetKeyboardMapping (dpy, min_keycode, (max_keycode - min_keycode + 1),
-			 &keysyms_per_keycode);
+    int k = 0;
+    int keysyms_per_keycode = GetKeysymsPerKeycode();
 
     fprintf (fp,
     	     "%s:  up to %d keys per modifier, (keycodes in parentheses):\n\n", 
     	     ProgramName, map->max_keypermod);
-    for (i = 0; i < 8; i++) {
-	int j;
-
+    for (int i = 0; i < 8; i++) {
 	fprintf(fp, "%-10s", modifier_table[i].name);
-	for (j = 0; j < map->max_keypermod; j++) {
+
+	for (int j = 0; j < map->max_keypermod; j++) {
 	    if (map->modifiermap[k]) {
 		KeySym ks;
 		int index = 0;