Return-Path: From: "wu.zheng" To: Cc: "wu.zheng" Subject: [PATCH] Check session->msg at sync_getphonebook_callback() Date: Tue, 3 May 2011 15:13:24 +0800 Message-Id: <1304406804-17761-1-git-send-email-wu.zheng@intel.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Fix the issues of code style. Check session->msg at sync_getphonebook_callback()in client/sync.c. Otherwise, session->msg will be NULL and cause segmentation fault error. The reason is that the condition of transfer->fd > 0 && session->msg is ok and session->msg will be set to NULL in the func of session_notify_progress when sync profile is used. --- client/sync.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/client/sync.c b/client/sync.c index 3622a3d..184a284 100644 --- a/client/sync.c +++ b/client/sync.c @@ -78,6 +78,9 @@ static void sync_getphonebook_callback(struct session_data *session, DBusMessage *reply; char *buf = NULL; + if (session->msg == NULL) + goto done; + reply = dbus_message_new_method_return(session->msg); if (transfer->filled > 0) @@ -91,6 +94,9 @@ static void sync_getphonebook_callback(struct session_data *session, g_dbus_send_message(session->conn, reply); dbus_message_unref(session->msg); session->msg = NULL; + +done: + transfer_unregister(transfer); } static DBusMessage *sync_getphonebook(DBusConnection *connection, -- 1.7.3.4