[maemo-commits] [maemo-commits] r13895 - in projects/haf/trunk/dbus/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-09-18 16:27:21 +0300 (Tue, 18 Sep 2007)
New Revision: 13895

Added:
   projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
fix invalid memory access in dbus_connection_filter_remove()


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-09-18 13:10:16 UTC (rev 13894)
+++ projects/haf/trunk/dbus/debian/changelog	2007-09-18 13:27:21 UTC (rev 13895)
@@ -1,3 +1,10 @@
+dbus (1.0.2-0osso11) experimental; urgency=low
+
+  * Fix bug in dbus_connection_filter_remove when removing a non-existing
+    filter. Fixes: NB#69207
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 18 Sep 2007 16:25:11 +0300
+
 dbus (1.0.2-0osso10) experimental; urgency=low
 
   * Added missing patch for activated process not inheriting oom_adj.

Added: projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch	2007-09-18 13:10:16 UTC (rev 13894)
+++ projects/haf/trunk/dbus/debian/patches/18-fix-remove-bogus-filter.patch	2007-09-18 13:27:21 UTC (rev 13895)
@@ -0,0 +1,25 @@
+diff -pur dbus-1.0.2/dbus/dbus-connection.c dbus-1.0.2.new/dbus/dbus-connection.c
+--- dbus-1.0.2/dbus/dbus-connection.c	2006-12-11 21:21:08.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-connection.c	2007-09-18 16:08:19.647124064 +0300
+@@ -5025,19 +5025,18 @@ dbus_connection_remove_filter (DBusConne
+         }
+         
+       link = _dbus_list_get_prev_link (&connection->filter_list, link);
++      filter = NULL;
+     }
+   
+   CONNECTION_UNLOCK (connection);
+ 
+-#ifndef DBUS_DISABLE_CHECKS
+   if (filter == NULL)
+     {
+       _dbus_warn_check_failed ("Attempt to remove filter function %p user data %p, but no such filter has been added\n",
+                                function, user_data);
+       return;
+     }
+-#endif
+-  
++
+   /* Call application code */
+   if (filter->free_user_data_function)
+     (* filter->free_user_data_function) (filter->user_data);