From dde5c591be74139ec6f2a90a3fdc7904d7342554 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sun, 11 Jan 2009 16:10:45 -0800 Subject: [PATCH] mieq: Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes This is more of a hack around the problem. This is something that will need to be addressed in a more structured manner with the multi threaded input efforts. (cherry picked from commit 3c596c061e75848cfa76dd9259c23a3f3a67444c) --- mi/mieq.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mi/mieq.c b/mi/mieq.c index d6b722de4..963f27c01 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -247,7 +247,14 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e) evt->event->u.keyButtonPointer.time = miEventQueue.lastEventTime; miEventQueue.lastEventTime = evt->event->u.keyButtonPointer.time; - miEventQueue.events[oldtail].pScreen = EnqueueScreen(pDev); + + /* Avoid possible crash when multithreaded and mieqEnqueue is called before + * InitAndStartDevices finishes. + */ + if(pDev && pDev->spriteInfo && pDev->spriteInfo->sprite) + miEventQueue.events[oldtail].pScreen = EnqueueScreen(pDev); + else + miEventQueue.events[oldtail].pScreen = NULL; miEventQueue.events[oldtail].pDev = pDev; miEventQueue.lastMotion = isMotion; @@ -403,7 +410,7 @@ mieqProcessInputEvents(void) /* Custom event handler */ handler = miEventQueue.handlers[type]; - if (screen != DequeueScreen(dev) && !handler) { + if (screen && screen != DequeueScreen(dev) && !handler) { /* Assumption - screen switching can only occur on motion events. */ DequeueScreen(dev) = screen; x = event->u.keyButtonPointer.rootX;