[glibmm] DBusConnection: Check for NULL bus name in the MethodCall callback.
- From: JosĂŠ Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] DBusConnection: Check for NULL bus name in the MethodCall callback.
- Date: Thu, 13 Jan 2011 04:01:44 +0000 (UTC)
commit 7846da750880ac7dde52ba40d7c4cbcbceecbc9e
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Wed Jan 12 22:49:01 2011 -0500
DBusConnection: Check for NULL bus name in the MethodCall callback.
* gio/src/dbusconnection.ccg
(DBusConnection_Message_Filter_giomm_callback): Since the sender can
be NULL, check for that so that creating a Glib::ustring from a NULL
does not cause exceptions.
ChangeLog | 9 +++++++++
gio/src/dbusconnection.ccg | 3 ++-
2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b0e4cdd..828ec6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-12 José Alburquerque <jaalburqu svn gnome org>
+
+ DBusConnection: Check for NULL bus name in the MethodCall callback.
+
+ * gio/src/dbusconnection.ccg
+ (DBusConnection_Message_Filter_giomm_callback): Since the sender can
+ be NULL, check for that so that creating a Glib::ustring from a NULL
+ does not cause exceptions.
+
2.27.91:
2011-01-11 José Alburquerque <jaalburqu svn gnome org>
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 6073215..a3b47ee 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -95,7 +95,8 @@ static void DBusInterfaceVTable_MethodCall_giomm_callback(
try
{
- (*the_slot)(Glib::wrap(connection, true), Glib::ustring(sender),
+ (*the_slot)(Glib::wrap(connection, true),
+ (sender ? Glib::ustring(sender) : ""),
Glib::ustring(object_path), Glib::ustring(interface_name),
Glib::ustring(method_name), Glib::VariantBase(parameters, true),
Glib::wrap(invocation, true));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]