ui: Fix memory leak in qemu_xkeymap_mapping_table()
Refactor qemu_xkeymap_mapping_table() to have a single exit point,
so we can easily free the memory allocated by XGetAtomName().
This fixes when running a binary configured with --enable-sanitizers:
Direct leak of 22 byte(s) in 1 object(s) allocated from:
#0 0x561344a7473f in malloc (qemu-system-x86_64+0x1dab73f)
#1 0x7fa4d9dc08aa in XGetAtomName (/lib64/libX11.so.6+0x2a8aa)
Fixes: 2ec78706d1
("ui: convert GTK and SDL1 frontends to keycodemapdb")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210430155009.259755-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
parent
db2dc7d8df
commit
7c06a34c8c
|
@ -56,6 +56,7 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen)
|
||||||
{
|
{
|
||||||
XkbDescPtr desc;
|
XkbDescPtr desc;
|
||||||
const gchar *keycodes = NULL;
|
const gchar *keycodes = NULL;
|
||||||
|
const guint16 *map;
|
||||||
|
|
||||||
/* There is no easy way to determine what X11 server
|
/* There is no easy way to determine what X11 server
|
||||||
* and platform & keyboard driver is in use. Thus we
|
* and platform & keyboard driver is in use. Thus we
|
||||||
|
@ -83,21 +84,21 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen)
|
||||||
if (check_for_xwin(dpy)) {
|
if (check_for_xwin(dpy)) {
|
||||||
trace_xkeymap_keymap("xwin");
|
trace_xkeymap_keymap("xwin");
|
||||||
*maplen = qemu_input_map_xorgxwin_to_qcode_len;
|
*maplen = qemu_input_map_xorgxwin_to_qcode_len;
|
||||||
return qemu_input_map_xorgxwin_to_qcode;
|
map = qemu_input_map_xorgxwin_to_qcode;
|
||||||
} else if (check_for_xquartz(dpy)) {
|
} else if (check_for_xquartz(dpy)) {
|
||||||
trace_xkeymap_keymap("xquartz");
|
trace_xkeymap_keymap("xquartz");
|
||||||
*maplen = qemu_input_map_xorgxquartz_to_qcode_len;
|
*maplen = qemu_input_map_xorgxquartz_to_qcode_len;
|
||||||
return qemu_input_map_xorgxquartz_to_qcode;
|
map = qemu_input_map_xorgxquartz_to_qcode;
|
||||||
} else if ((keycodes && g_str_has_prefix(keycodes, "evdev")) ||
|
} else if ((keycodes && g_str_has_prefix(keycodes, "evdev")) ||
|
||||||
(XKeysymToKeycode(dpy, XK_Page_Up) == 0x70)) {
|
(XKeysymToKeycode(dpy, XK_Page_Up) == 0x70)) {
|
||||||
trace_xkeymap_keymap("evdev");
|
trace_xkeymap_keymap("evdev");
|
||||||
*maplen = qemu_input_map_xorgevdev_to_qcode_len;
|
*maplen = qemu_input_map_xorgevdev_to_qcode_len;
|
||||||
return qemu_input_map_xorgevdev_to_qcode;
|
map = qemu_input_map_xorgevdev_to_qcode;
|
||||||
} else if ((keycodes && g_str_has_prefix(keycodes, "xfree86")) ||
|
} else if ((keycodes && g_str_has_prefix(keycodes, "xfree86")) ||
|
||||||
(XKeysymToKeycode(dpy, XK_Page_Up) == 0x63)) {
|
(XKeysymToKeycode(dpy, XK_Page_Up) == 0x63)) {
|
||||||
trace_xkeymap_keymap("kbd");
|
trace_xkeymap_keymap("kbd");
|
||||||
*maplen = qemu_input_map_xorgkbd_to_qcode_len;
|
*maplen = qemu_input_map_xorgkbd_to_qcode_len;
|
||||||
return qemu_input_map_xorgkbd_to_qcode;
|
map = qemu_input_map_xorgkbd_to_qcode;
|
||||||
} else {
|
} else {
|
||||||
trace_xkeymap_keymap("NULL");
|
trace_xkeymap_keymap("NULL");
|
||||||
g_warning("Unknown X11 keycode mapping '%s'.\n"
|
g_warning("Unknown X11 keycode mapping '%s'.\n"
|
||||||
|
@ -109,6 +110,10 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen)
|
||||||
" - xprop -root\n"
|
" - xprop -root\n"
|
||||||
" - xdpyinfo\n",
|
" - xdpyinfo\n",
|
||||||
keycodes ? keycodes : "<null>");
|
keycodes ? keycodes : "<null>");
|
||||||
return NULL;
|
map = NULL;
|
||||||
}
|
}
|
||||||
|
if (keycodes) {
|
||||||
|
XFree((void *)keycodes);
|
||||||
|
}
|
||||||
|
return map;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue