fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-01 21:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

text: Don't crash if a seat has no keyboard

Browse source 
A keyboard might not be present in a seat, so check that before
dereferencing keyboard related pointers.

Also, use the keyboard pointer we set to shorten the code a little bit.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Jan Arne Petersen <janarne@gmail.com>
This commit is contained in:
Derek Foreman 2014-12-08 10:48:29 -06:00 • committed by Pekka Paalanen
parent 943b46ed66
commit f0aaa41748
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/text-backend.c
View file

@ -755,15 +755,19 @@ input_method_context_create(struct text_input *model,
static void
input_method_context_end_keyboard_grab(struct input_method_context *context)
{
struct weston_keyboard_grab *grab =
&context->input_method->seat->keyboard->input_method_grab;
struct weston_keyboard *keyboard = grab->keyboard;
struct weston_keyboard_grab *grab;
struct weston_keyboard *keyboard;
if (!grab->keyboard)
if (!context->input_method->seat->keyboard)
return;
if (grab->keyboard->grab == grab)
weston_keyboard_end_grab(grab->keyboard);
grab = &context->input_method->seat->keyboard->input_method_grab;
keyboard = grab->keyboard;
if (!keyboard)
return;
if (keyboard->grab == grab)
weston_keyboard_end_grab(keyboard);
keyboard->input_method_resource = NULL;
}