[maemo-commits] [maemo-commits] r11768 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-05-23 13:22:54 +0300 (Wed, 23 May 2007)
New Revision: 11768

Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/24-NB32771-daemon-connection-leaks.patch
Log:
Fix a daemon crash for mkdir.

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-05-23 09:11:19 UTC (rev 11767)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-05-23 10:22:54 UTC (rev 11768)
@@ -1,3 +1,10 @@
+osso-gnome-vfs2 (2.16.3-1osso17) unstable; urgency=low
+
+  * UNRELEASED
+  * Fix a daemon crash for "mkdir"
+
+ -- Richard Hult <richard at imendio.com>  Wed, 23 May 2007 14:12:45 +0200
+
 osso-gnome-vfs2 (2.16.3-1osso16) unstable; urgency=low
 
   * Fix related to NB#54827 and NB#54832, but needs fix in ke-recv

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/patches/24-NB32771-daemon-connection-leaks.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/24-NB32771-daemon-connection-leaks.patch	2007-05-23 09:11:19 UTC (rev 11767)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/24-NB32771-daemon-connection-leaks.patch	2007-05-23 10:22:54 UTC (rev 11768)
@@ -1,9 +1,7 @@
-Index: daemon/daemon-connection.c
-===================================================================
---- daemon/daemon-connection.c	(revision 7519)
-+++ daemon/daemon-connection.c	(working copy)
-@@ -1468,6 +1468,8 @@
- 		uri, perm, context);
+--- daemon/daemon-connection.c-unmod	2007-05-23 12:07:29.000000000 +0200
++++ daemon/daemon-connection.c	2007-05-23 12:10:29.000000000 +0200
+@@ -1367,6 +1367,8 @@ connection_handle_get_file_info (DaemonC
+ 							  context);
  	gnome_vfs_daemon_set_current_connection (NULL);
  
 +	gnome_vfs_uri_unref (uri);
@@ -11,11 +9,33 @@
  	if (cancellation) {
  		connection_remove_cancellation (conn, cancellation);
  	}
-@@ -1726,6 +1728,7 @@
- 	}
+@@ -1477,6 +1479,8 @@ connection_handle_is_local (DaemonConnec
+ 	is_local = gnome_vfs_uri_is_local (uri);
+ 	gnome_vfs_daemon_set_current_connection (NULL);
  
++	gnome_vfs_uri_unref (uri);
++
+ 	reply = connection_create_reply_ok (message);
+ 
+ 	dbus_message_iter_init_append (reply, &iter);
+@@ -1894,6 +1898,9 @@ connection_handle_find_directory (Daemon
  	gnome_vfs_uri_unref (uri);
-+	gnome_vfs_file_info_unref (info);
  
- 	connection_reply_result (conn, message, result);
+ 	if (connection_check_and_reply_error (conn, message, result)) {
++		if (result_uri) {
++			gnome_vfs_uri_unref (result_uri);
++		}
+ 		return;
+ 	}
+ 
+@@ -1909,6 +1916,10 @@ connection_handle_find_directory (Daemon
+ 	}
+ 	g_free (str);
+ 
++	if (result_uri) {
++		gnome_vfs_uri_unref (result_uri);
++	}
++
+ 	dbus_connection_send (conn->conn, reply, NULL);
+ 	dbus_message_unref (reply);
  }