From a6e3304c3e976bc684f5d1a59a748492a8184f23 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Mon, 19 May 2014 13:05:06 +0400 Subject: [PATCH] [mms-handler-dbus] Avoid passing NULL to D-Bus stub To and From headers in M-Retrieve.conf are optional. If those are missing, NULL strings would be passed to generated D-bus proxy which doesn't like it. --- mms-handler-dbus/src/mms_handler_dbus.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mms-handler-dbus/src/mms_handler_dbus.c b/mms-handler-dbus/src/mms_handler_dbus.c index 5e8de7a..59b58d4 100644 --- a/mms-handler-dbus/src/mms_handler_dbus.c +++ b/mms-handler-dbus/src/mms_handler_dbus.c @@ -104,6 +104,8 @@ mms_handler_dbus_message_received( if (msg->id && msg->id[0] && proxy) { const char* nothing = NULL; const char* subject = msg->subject ? msg->subject : ""; + const char* from = msg->from ? msg->from : ""; + const char** to = msg->to ? (const char**)msg->to : ¬hing; const char** cc = msg->cc ? (const char**)msg->cc : ¬hing; GError* error = NULL; GSList* list = msg->parts; @@ -120,11 +122,11 @@ mms_handler_dbus_message_received( parts = g_variant_ref_sink(g_variant_builder_end(&b)); ok = org_nemomobile_mms_handler_call_message_received_sync( - proxy, msg->id, msg->message_id, msg->from, (const char**)msg->to, - cc, subject, msg->date, msg->priority, - msg->cls, msg->read_report_req, parts, NULL, &error); + proxy, msg->id, msg->message_id, from, to, cc, subject, + msg->date, msg->priority, msg->cls, msg->read_report_req, + parts, NULL, &error); if (!ok) { - MMS_ERR("Failed to nofity commhistoryd: %s", MMS_ERRMSG(error)); + MMS_ERR("Failed to notify commhistoryd: %s", MMS_ERRMSG(error)); g_error_free(error); }