vino r787 - in trunk: . server

[jwendell svn gnome org]

Author: jwendell
Date: Sun Feb 17 23:55:49 2008
New Revision: 787
URL: http://svn.gnome.org/viewvc/vino?rev=787&view=rev

Log:
2008-02-17  Jonh Wendell  <jwendell gnome org>

	* server/vino-server.c:
	* server/vino-status-icon.c: Fix a crash when client disconnect just
	after connecting.


Modified:
   trunk/ChangeLog
   trunk/server/vino-server.c
   trunk/server/vino-status-icon.c

Modified: trunk/server/vino-server.c
==============================================================================
--- trunk/server/vino-server.c	(original)
+++ trunk/server/vino-server.c	Sun Feb 17 23:55:49 2008
@@ -222,10 +222,10 @@
 	  g_io_channel_unref (client->io_channel);
 	  client->io_channel = NULL;
 
-	  g_free (l->data);
 	  server->priv->clients = g_slist_delete_link (server->priv->clients, l);
 
           vino_server_client_disconnected (server, client);
+	  g_free (client);
 
 	  break;
 	}

Modified: trunk/server/vino-status-icon.c
==============================================================================
--- trunk/server/vino-status-icon.c	(original)
+++ trunk/server/vino-status-icon.c	Sun Feb 17 23:55:49 2008
@@ -600,6 +600,12 @@
       return FALSE;
     }
 
+  if (g_slist_index (icon->priv->clients, client) == -1)
+    {
+      g_free (user_data);
+      return FALSE;
+    }
+
   if (icon->priv->new_client_notification)
     {
       notify_notification_close (icon->priv->new_client_notification, NULL);