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

DeliverEventsToWindow: ensure that genericMask has a defined value.

This commit is contained in:
Peter Hutterer 2007-07-10 13:56:38 +09:30
parent 583e988b9f
commit ffdf8f3e45
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -9,4 +9,4 @@ cd $srcdir
autoreconf -v --install || exit 1 autoreconf -v --install || exit 1
cd $ORIGDIR || exit $? cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode --disable-dmx --enable-kdrive "$@" $srcdir/configure --enable-maintainer-mode --disable-dmx --enable-dri --enable-kdrive "$@"

5
dix/events.c
View File

@ -2020,9 +2020,8 @@ DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
/* get the XGE event mask. /* get the XGE event mask.
* FIXME: needs to be freed somewhere too. * FIXME: needs to be freed somewhere too.
*/ */
if (!pWin->optional || !pWin->optional->geMasks) tempGrab.genericMasks = NULL;
tempGrab.genericMasks = NULL; if (pWin->optional && pWin->optional->geMasks)
else
{ {
GenericClientMasksPtr gemasks = pWin->optional->geMasks; GenericClientMasksPtr gemasks = pWin->optional->geMasks;
GenericMaskPtr geclient = gemasks->geClients; GenericMaskPtr geclient = gemasks->geClients;