80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

qt: Fix potential UAF and leak in Wayland xkbcommon keyboard

Browse Source
This commit is contained in:
RichardG867
2023-04-09 19:38:05 -03:00
parent e492640d65
commit 6f8fffc275
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/qt/xkbcommon_wl_keyboard.cpp
View File

@@ -70,15 +70,20 @@ kbd_keymap(void *data, struct wl_keyboard *wl_kbd, uint32_t format,
return; return;
} }
if (seat->keymap) {
static struct xkb_keymap *keymap = seat->keymap;
seat->keymap = NULL;
xkbcommon_wl_set_keymap();
xkb_keymap_unref(keymap);
}
seat->keymap = xkb_keymap_new_from_buffer(ctx, buf, size - 1, seat->keymap = xkb_keymap_new_from_buffer(ctx, buf, size - 1,
XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_FORMAT_TEXT_V1,
XKB_KEYMAP_COMPILE_NO_FLAGS); XKB_KEYMAP_COMPILE_NO_FLAGS);
munmap(buf, size); munmap(buf, size);
close(fd); close(fd);
if (!seat->keymap) { if (!seat->keymap)
qWarning() << "XKB Keyboard: Keymap compilation failed"; qWarning() << "XKB Keyboard: Keymap compilation failed";
return;
}
xkbcommon_wl_set_keymap(); xkbcommon_wl_set_keymap();
} }