xserver/xfixes cursor.c,1.5,1.6 select.c,1.4,1.5

Keith Packard xserver-commit at pdx.freedesktop.org
Fri Nov 12 11:08:02 PST 2004


Committed by: keithp

Update of /cvs/xserver/xserver/xfixes
In directory gabe:/tmp/cvs-serv29466/xfixes

Modified Files:
	cursor.c select.c 
Log Message:
2004-11-12  Keith Packard  <keithp at keithp.com>

	* xfixes/cursor.c: (CursorDisplayCursor):
	* xfixes/select.c: (XFixesSelectionCallback):
	Check client->clientGone before sending events to avoid crash


Index: cursor.c
===================================================================
RCS file: /cvs/xserver/xserver/xfixes/cursor.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cursor.c	2 Nov 2003 19:56:11 -0000	1.5
+++ cursor.c	12 Nov 2004 19:08:00 -0000	1.6
@@ -95,7 +95,8 @@
 	CursorCurrent = pCursor;
 	for (e = cursorEvents; e; e = e->next)
 	{
-	    if (e->eventMask & XFixesDisplayCursorNotifyMask)
+	    if (e->eventMask & XFixesDisplayCursorNotifyMask &&
+		!e->pClient->clientGone)
 	    {
 		xXFixesCursorNotifyEvent	ev;
 		ev.type = XFixesEventBase + XFixesCursorNotify;

Index: select.c
===================================================================
RCS file: /cvs/xserver/xserver/xfixes/select.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- select.c	9 Oct 2003 01:52:14 -0000	1.4
+++ select.c	12 Nov 2004 19:08:00 -0000	1.5
@@ -77,7 +77,8 @@
     }
     for (e = selectionEvents; e; e = e->next)
     {
-	if (e->selection == selection->selection && (e->eventMask & eventMask))
+	if (e->selection == selection->selection && (e->eventMask & eventMask)
+	    && !e->pClient->clientGone)
 	{
 	    xXFixesSelectionNotifyEvent	ev;
 



More information about the xserver-commit mailing list