StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: try to fix crash in xkb_x11_keymap_new_from_device error handling 

In 1b3a1c277a we changed the error
handling in this code to not bail out immediately but only after
everything has been processed, to simplify the code. But I suspect the
code isn't prepared for this and that's what causing the crash reported
in the issue.

Bring back the short-circuit error handling which would hopefully fix
such crashes.

Fixes: https://github.com/xkbcommon/libxkbcommon/issues/252
Signed-off-by: Ran Benita <ran@unusedvar.com>
master
Ran Benita 2021-08-31 21:50:52 +03:00
parent 4e361712d2
commit 4a576ab184
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/x11/keymap.c
View File

@ -1160,6 +1160,10 @@ xkb_x11_keymap_new_from_device(struct xkb_context *ctx,
struct x11_atom_interner interner; struct x11_atom_interner interner;
x11_atom_interner_init(&interner, ctx, conn); x11_atom_interner_init(&interner, ctx, conn);
/*
* Send all requests together so only one roundtrip is needed
* to get the replies.
*/
xcb_xkb_get_map_cookie_t map_cookie = xcb_xkb_get_map_cookie_t map_cookie =
xcb_xkb_get_map(conn, device_id, get_map_required_components, xcb_xkb_get_map(conn, device_id, get_map_required_components,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
@ -1172,19 +1176,33 @@ xkb_x11_keymap_new_from_device(struct xkb_context *ctx,
xcb_xkb_get_controls_cookie_t controls_cookie = xcb_xkb_get_controls_cookie_t controls_cookie =
xcb_xkb_get_controls(conn, device_id); xcb_xkb_get_controls(conn, device_id);
bool had_error = false; if (!get_map(keymap, conn, map_cookie))
had_error |= !get_map(keymap, conn, map_cookie); goto err_map;
had_error |= !get_indicator_map(keymap, conn, indicator_map_cookie); if (!get_indicator_map(keymap, conn, indicator_map_cookie))
had_error |= !get_compat_map(keymap, conn, compat_map_cookie); goto err_indicator_map;
had_error |= !get_names(keymap, &interner, names_cookie); if (!get_compat_map(keymap, conn, compat_map_cookie))
had_error |= !get_controls(keymap, conn, controls_cookie); goto err_compat_map;
if (!get_names(keymap, &interner, names_cookie))
goto err_names;
if (!get_controls(keymap, conn, controls_cookie))
goto err_controls;
x11_atom_interner_round_trip(&interner); x11_atom_interner_round_trip(&interner);
had_error |= interner.had_error; if (interner.had_error)
goto err_interner;
if (had_error) {
xkb_keymap_unref(keymap);
return NULL;
}
return keymap; return keymap;
err_map:
xcb_discard_reply(conn, indicator_map_cookie.sequence);
err_indicator_map:
xcb_discard_reply(conn, compat_map_cookie.sequence);
err_compat_map:
xcb_discard_reply(conn, names_cookie.sequence);
err_names:
xcb_discard_reply(conn, controls_cookie.sequence);
err_controls:
x11_atom_interner_round_trip(&interner);
err_interner:
xkb_keymap_unref(keymap);
return NULL;
} }