diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-11-30 09:06:06 +1000 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-18 11:28:45 -0800 |
| commit | 85ee512bd573ea613054d167dc0039d8b017ff66 (patch) | |
| tree | 407b7a787ad494b48edde2d9b801a0fd1763c707 | |
| parent | 9e0f777b7b8855068f0702dd19f0358a2c214cd4 (diff) | |
xfixes: don't dereference a NULL cursor
If the new cursor is the NULL cursor, don't dereference it and use zeros
instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 1ab50be938524dcd4a9e56d27e3b96a27c2db2c0)
| -rw-r--r-- | xfixes/cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfixes/cursor.c b/xfixes/cursor.c index fb608f694..6e07f4f20 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -165,9 +165,9 @@ CursorDisplayCursor (DeviceIntPtr pDev, ev.type = XFixesEventBase + XFixesCursorNotify; ev.subtype = XFixesDisplayCursorNotify; ev.window = e->pWindow->drawable.id; - ev.cursorSerial = pCursor->serialNumber; + ev.cursorSerial = pCursor ? pCursor->serialNumber : 0; ev.timestamp = currentTime.milliseconds; - ev.name = pCursor->name; + ev.name = pCursor ? pCursor->name : None; WriteEventsToClient (e->pClient, 1, (xEvent *) &ev); } } |