frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mieq: Protect from pDev=NULL in mieqEnqueue and mieqProcessInputEvents 

(cherry picked from commit bf60ffb49700da367f7f88983b042a88fef7219b)
This commit is contained in:
Jeremy Huddleston 2009-07-25 20:17:25 -07:00
parent dab8de0368
commit b8e0f74082
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mi/mieq.c
View File

@ -217,7 +217,7 @@ mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e)
e->any.time = miEventQueue.lastEventTime; e->any.time = miEventQueue.lastEventTime;
miEventQueue.lastEventTime = ((InternalEvent*)evt->event)->any.time; miEventQueue.lastEventTime = ((InternalEvent*)evt->event)->any.time;
miEventQueue.events[oldtail].pScreen = EnqueueScreen(pDev); miEventQueue.events[oldtail].pScreen = pDev ? EnqueueScreen(pDev) : NULL;
miEventQueue.events[oldtail].pDev = pDev; miEventQueue.events[oldtail].pDev = pDev;
miEventQueue.lastMotion = isMotion; miEventQueue.lastMotion = isMotion;
@ -383,7 +383,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
/* Custom event handler */ /* Custom event handler */
handler = miEventQueue.handlers[event->any.type]; handler = miEventQueue.handlers[event->any.type];
if (screen && screen != DequeueScreen(dev) && !handler) { if (dev && screen && screen != DequeueScreen(dev) && !handler) {
/* Assumption - screen switching can only occur on motion events. */ /* Assumption - screen switching can only occur on motion events. */
DequeueScreen(dev) = screen; DequeueScreen(dev) = screen;
x = event->device.root_x; x = event->device.root_x;
@ -400,12 +400,12 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
* steal it. */ * steal it. */
if (handler) if (handler)
{ {
handler(DequeueScreen(dev)->myNum, event, dev); int screenNum = dev && DequeueScreen(dev) ? DequeueScreen(dev)->myNum : (screen ? screen->myNum : 0);
handler(screenNum, event, dev);
/* Check for the SD's master in case the device got detached /* Check for the SD's master in case the device got detached
* during event processing */ * during event processing */
if (master && dev->u.master) if (master && dev->u.master)
handler(DequeueScreen(master)->myNum, handler(screenNum, (InternalEvent*)masterEvents->event, master);
(InternalEvent*)masterEvents->event, master);
} else } else
{ {
/* process slave first, then master */ /* process slave first, then master */
@ -459,7 +459,7 @@ mieqProcessInputEvents(void)
pthread_mutex_unlock(&miEventQueueMutex); pthread_mutex_unlock(&miEventQueueMutex);
#endif #endif
master = (!IsMaster(dev) && dev->u.master) ? dev->u.master : NULL; master = (dev && !IsMaster(dev) && dev->u.master) ? dev->u.master : NULL;
if (screenIsSaved == SCREEN_SAVER_ON) if (screenIsSaved == SCREEN_SAVER_ON)
dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset); dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);