From 14d0397cded699378fa3c19f4e61dbab7d3a9b2c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Aug 2007 22:12:29 +0930 Subject: [PATCH] dix: ProcUngrabKeyboard: make sure grab is initialized. This should fix the random segfaults with ProcUngrabKeyboard. Thanks to David Nolden for spotting it. --- dix/events.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dix/events.c b/dix/events.c index 4cfdab757..76894ca55 100644 --- a/dix/events.c +++ b/dix/events.c @@ -5139,6 +5139,8 @@ ProcUngrabKeyboard(ClientPtr client) REQUEST_SIZE_MATCH(xResourceReq); UpdateCurrentTime(); + grab = device->deviceGrab.grab; + if (!grab || !grab->coreGrab || !SameClient(grab, client)) { for (grabbed = inputInfo.devices; grabbed; grabbed = grabbed->next)