summaryrefslogtreecommitdiff
path: root/xfixes
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-11-30 09:06:06 +1000
committerJeremy Huddleston <jeremyhu@apple.com>2012-01-02 15:38:52 -0500
commite4984b3023351b5fcc506f4a196ad699db8b0535 (patch)
tree47923c05ac4775be823de8ecce6b841afc79319a /xfixes
parent625d1088192a9ad972c20fbdbcb4bb9fda979157 (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)
Diffstat (limited to 'xfixes')
-rw-r--r--xfixes/cursor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index ecbed4016..7b01c8b52 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -179,9 +179,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);
}
}