im/ximcp: release modifiermap before returning

Variable "map" goes out of scope Release modifiermap before returning. Reordered code to call XGetModifierMapping after the first return from the function. Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

im/ximcp: release modifiermap before returning
e4815126 · Erkki Seppälä · Ulrich Sibiller · 018d938a · e4815126
Commit e4815126 authored Jan 10, 2011 by Erkki Seppälä Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

imThaiFlt.c nx-X11/lib/X11/imThaiFlt.c +9 -2

No files found.
--- a/nx-X11/lib/X11/imThaiFlt.c
+++ b/nx-X11/lib/X11/imThaiFlt.c
@@ -1262,15 +1262,22 @@ Private unsigned
 NumLockMask(Display *d)
 {
    int i;
-    XModifierKeymap *map = XGetModifierMapping (d);
+    XModifierKeymap *map;
    KeyCode numlock_keycode = XKeysymToKeycode (d, XK_Num_Lock);
    if (numlock_keycode == NoSymbol)
        return 0;

+    map = XGetModifierMapping (d);
+    if (!map)
+        return 0;
+
    for (i = 0; i < 8; i++) {
-        if (map->modifiermap[map->max_keypermod * i] == numlock_keycode)
+        if (map->modifiermap[map->max_keypermod * i] == numlock_keycode) {
+            XFreeModifiermap(map);
            return 1 << i;
+        }
    }
+    XFreeModifiermap(map);
    return 0;
 }