r11210 - in /packages/unstable/loudmouth/debian: changelog patches/01-workaround_0_connection_data.patch

[nobse at users.alioth.debian.org]

Author: nobse
Date: Wed May 30 09:08:49 2007
New Revision: 11210

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11210
Log:
Added patch from Ubuntu to fix crash when connection_data->connection is used as a pointer.

Added:
    packages/unstable/loudmouth/debian/patches/01-workaround_0_connection_data.patch
Modified:
    packages/unstable/loudmouth/debian/changelog

Modified: packages/unstable/loudmouth/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/loudmouth/debian/changelog?rev=11210&op=diff
==============================================================================
--- packages/unstable/loudmouth/debian/changelog (original)
+++ packages/unstable/loudmouth/debian/changelog Wed May 30 09:08:49 2007
@@ -14,7 +14,11 @@
   [ Loic Minier ]
   * Flip 01_free_callback; seems it was reversed.
 
- -- Loic Minier <lool at dooz.org>  Tue, 29 May 2007 16:09:53 +0200
+  [ Norbert Tretkowski ]
+  * Added patch from Ubuntu to fix crash when connection_data->connection
+    is used as a pointer.
+
+ -- Norbert Tretkowski <nobse at debian.org>  Wed, 30 May 2007 11:07:41 +0200
 
 loudmouth (1.2.1-1) unstable; urgency=low
 

Added: packages/unstable/loudmouth/debian/patches/01-workaround_0_connection_data.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/loudmouth/debian/patches/01-workaround_0_connection_data.patch?rev=11210&op=file
==============================================================================
--- packages/unstable/loudmouth/debian/patches/01-workaround_0_connection_data.patch (added)
+++ packages/unstable/loudmouth/debian/patches/01-workaround_0_connection_data.patch Wed May 30 09:08:49 2007
@@ -1,0 +1,23 @@
+diff -ur loudmouth-1.1.4/loudmouth/lm-connection.c loudmouth-1.1.4.new/loudmouth/lm-connection.c
+--- loudmouth-1.1.4/loudmouth/lm-connection.c	2006-09-21 14:36:00.000000000 +0300
++++ loudmouth-1.1.4.new/loudmouth/lm-connection.c	2006-10-06 18:29:41.000000000 +0300
+@@ -526,6 +526,19 @@
+ 	socklen_t        len;
+ 	LmSocket         fd; 
+ 
++	/* FIXME: This is just a work-around to avoid a crash. The real problem
++	 * is with this function being called in the first place with fd == 0.
++	 *
++	 * When that happens, connect_data->connection seems to be 0x1 and
++	 * condition = G_IO_OUT. Also the connection has already been
++	 * established.
++	 */
++	if (connect_data->fd == 0) {
++		g_warning ("%s called with connection_data->fd == 0\n",
++		           __FUNCTION__);
++		return FALSE;
++	}
++
+ 	connection = connect_data->connection;
+ 	addr = connect_data->current_addr;
+ 	fd = g_io_channel_unix_get_fd (source);