[maemo-commits] [maemo-commits] r8568 - in projects/haf/trunk/osso-gnome-vfs2: . dbus-daemon debian

[From: subversion at stage.maemo.org]

Author: richard
Date: 2006-12-04 11:26:48 +0200 (Mon, 04 Dec 2006)
New Revision: 8568

Modified:
   projects/haf/trunk/osso-gnome-vfs2/ChangeLog
   projects/haf/trunk/osso-gnome-vfs2/configure.in
   projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/daemon-connection.c
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
NB#47756.

Modified: projects/haf/trunk/osso-gnome-vfs2/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/ChangeLog	2006-12-04 07:23:23 UTC (rev 8567)
+++ projects/haf/trunk/osso-gnome-vfs2/ChangeLog	2006-12-04 09:26:48 UTC (rev 8568)
@@ -1,8 +1,13 @@
-2006-11-15  Martyn Russell  <martyn at imendio.com>
+2006-12-04  Richard Hult  <richard at imendio.com>
 
-	* debian/patches/20-workaround-broken-upnp-servers.patch: Make sure we
-	return the aborted() value, fixes NB#45468. 
+	* Release 2.12.0.17.
 
+	* configure.in: Bump version.
+
+	* dbus-daemon/daemon-connection.c: (connection_handle_close): NULL
+	the vfs handle unconditionally, since most modules will destroy
+	their internal data even when closing fails. Fixes NB#47756.
+
 2006-10-13  Martyn Russell  <martyn at imendio.com>
 
 	* Release 2.12.0.16.

Modified: projects/haf/trunk/osso-gnome-vfs2/configure.in
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/configure.in	2006-12-04 07:23:23 UTC (rev 8567)
+++ projects/haf/trunk/osso-gnome-vfs2/configure.in	2006-12-04 09:26:48 UTC (rev 8568)
@@ -14,7 +14,7 @@
 
 # If you need a modifier for the version number. 
 # Normally empty, but can be used to make "fixup" releases.
-LIBGNOMEVFS_EXTRAVERSION=16
+LIBGNOMEVFS_EXTRAVERSION=17
 
 dnl libtool versioning from libgnome
 

Modified: projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/daemon-connection.c
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/daemon-connection.c	2006-12-04 07:23:23 UTC (rev 8567)
+++ projects/haf/trunk/osso-gnome-vfs2/dbus-daemon/daemon-connection.c	2006-12-04 09:26:48 UTC (rev 8568)
@@ -934,6 +934,13 @@
 	result = gnome_vfs_close_cancellable (handle->vfs_handle,
 					      context);
 
+	/* Clear the handle so we don't close it twice. If close is not
+	 * successful, all modules destroy their internal handle data anyway so
+	 * we can't call close twice on a handle even if it fails the first
+	 * time.
+	 */
+	handle->vfs_handle = NULL;
+	
 	if (cancellation) {
 		connection_remove_cancellation (conn, cancellation);
 	}
@@ -942,9 +949,6 @@
 		return;
 	}
 
-	/* Clear the handle so we don't close it twice. */
-	handle->vfs_handle = NULL;
-	
 	connection_remove_file_handle (conn, handle);
 
 	connection_reply_ok (conn, message);

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2006-12-04 07:23:23 UTC (rev 8567)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2006-12-04 09:26:48 UTC (rev 8568)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.12.0.17-2osso1) unstable; urgency=low
+
+  * Fixes NB#47756: dbus-vfs-daemon segmentation fault.
+
+ -- Richard Hult <richard at imendio.com>  Mon,  4 Dec 2006 09:59:13 +0100
+
 osso-gnome-vfs2 (2.12.0.16-2osso5) unstable; urgency=low
 
   * Fixes NB#45468: Compilation warning in imported neon.