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

XFree86 DGA: Guard against NULL pointer dereferences. 

Ass, u, me ...
This commit is contained in:
Daniel Stone 2007-03-21 02:35:31 +02:00 committed by Daniel Stone
parent f292de2ef1
commit 3e9f7a5504
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86Xinput.c
View File

@ -423,6 +423,7 @@ xf86PostMotionEvent(DeviceIntPtr device,
#if XFreeXDGA #if XFreeXDGA
if (first_valuator == 0 && num_valuators >= 2) { if (first_valuator == 0 && num_valuators >= 2) {
if (miPointerGetScreen(inputInfo.pointer)) {
index = miPointerGetScreen(inputInfo.pointer)->myNum; index = miPointerGetScreen(inputInfo.pointer)->myNum;
if (is_absolute) { if (is_absolute) {
dx = valuators[0] - device->valuator->lastx; dx = valuators[0] - device->valuator->lastx;
@ -435,6 +436,7 @@ xf86PostMotionEvent(DeviceIntPtr device,
if (DGAStealMotionEvent(index, dx, dy)) if (DGAStealMotionEvent(index, dx, dy))
goto out; goto out;
} }
}
#endif #endif
if (!xf86Events) if (!xf86Events)
@ -505,9 +507,11 @@ xf86PostButtonEvent(DeviceIntPtr device,
int index; int index;
#if XFreeXDGA #if XFreeXDGA
if (miPointerGetScreen(inputInfo.pointer)) {
index = miPointerGetScreen(inputInfo.pointer)->myNum; index = miPointerGetScreen(inputInfo.pointer)->myNum;
if (DGAStealButtonEvent(index, button, is_down)) if (DGAStealButtonEvent(index, button, is_down))
return; return;
}
#endif #endif
valuators = xcalloc(sizeof(int), num_valuators); valuators = xcalloc(sizeof(int), num_valuators);
@ -588,9 +592,11 @@ xf86PostKeyboardEvent(DeviceIntPtr device,
int index; int index;
#if XFreeXDGA #if XFreeXDGA
if (miPointerGetScreen(inputInfo.pointer)) {
index = miPointerGetScreen(inputInfo.pointer)->myNum; index = miPointerGetScreen(inputInfo.pointer)->myNum;
if (DGAStealKeyEvent(index, key_code, is_down)) if (DGAStealKeyEvent(index, key_code, is_down))
return; return;
}
#endif #endif
if (!xf86Events) if (!xf86Events)