From 3319741e6f9fc3232eb40462a261271b9af2dcb2 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 20 May 2010 07:07:37 +0000
Subject: xserver git update 20/5/2010

---
 xorg-server/os/io.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'xorg-server/os')

diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c
index a963d8653..82a2c5875 100644
--- a/xorg-server/os/io.c
+++ b/xorg-server/os/io.c
@@ -698,15 +698,17 @@ SetCriticalOutputPending(void)
 int
 WriteToClient (ClientPtr who, int count, const void *__buf)
 {
-    OsCommPtr oc = (OsCommPtr)who->osPrivate;
-    ConnectionOutputPtr oco = oc->output;
+    OsCommPtr oc;
+    ConnectionOutputPtr oco;
     int padBytes;
     const char *buf = __buf;
 #ifdef DEBUG_COMMUNICATION
     Bool multicount = FALSE;
 #endif
-    if (!count)
+    if (!count || !who || who == serverClient || who->clientGone)
 	return(0);
+    oc = who->osPrivate;
+    oco = oc->output;
 #ifdef DEBUG_COMMUNICATION
     {
 	char info[128];
-- 
cgit v1.2.3