summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2006-04-07 01:20:35 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2006-04-07 01:20:35 +0000
commit195524643a6f050e6d55f4c0000c8e39319c7b14 (patch)
tree4dcc0abb51b4f38416846e0ee4f0ce22a7d2391d
parentbd5af2a53e631e36199af000f97f6eed8681eb8c (diff)
Free modifier map when done with it (Coverity #823 & 824)
Free Xkb keyboard description when done with it (Coverity #825)
-rw-r--r--ChangeLog8
-rw-r--r--xset.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 879a19c..45bc67e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-06 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * xset.c (set_lock):
+ Free modifier map when done with it (Coverity #823 & 824)
+
+ * xset.c (xkbset_repeatrate):
+ Free Xkb keyboard description when done with it (Coverity #825)
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/xset.c b/xset.c
index 9fd75cf..a77d977 100644
--- a/xset.c
+++ b/xset.c
@@ -1141,6 +1141,7 @@ xkbset_repeatrate(Display *dpy, int delay, int interval)
xkb->ctrls->repeat_delay = delay;
xkb->ctrls->repeat_interval = interval;
XkbSetControls(dpy, XkbRepeatKeysMask, xkb);
+ XkbFreeKeyboard(xkb, 0, True);
}
#endif
@@ -1222,6 +1223,7 @@ set_lock(Display *dpy, Bool onoff)
else
mods = XDeleteModifiermapEntry(mods, (KeyCode) XK_Caps_Lock, LockMapIndex);
XSetModifierMapping(dpy, mods);
+ XFreeModifiermap(mods);
return;
}