Add to check the error of signal subscribe

Change-Id: I40d12aec304151927abe9814db677ab3ae537b88
(cherry picked from commit 98ff7cf39ac66448e385db3fc01b9d124c6c2df7)

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index e2c181a7d5ff9a029f65c7a9721aab28e4870357..c911f372e10b2fe49578f1c43499e466d56f213e 100644 (file)
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.1.76
+Version:    0.1.77
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c
index 7148c4ed20612245188886bba98997f501c76bac..0932ab332e56f1d9d2149625cd4b94345800ae89 100755 (executable)
--- a/src/media_controller_ipc.c
+++ b/src/media_controller_ipc.c
@@ -165,7 +165,6 @@ int mc_ipc_unref_dbus_connection(GDBusConnection *connection, int *dref_count)
 int mc_ipc_register_listener(GList **listener_list, GDBusConnection *connection, const char *interface_name, const char *signal_name, mc_signal_received_cb callback, void *user_data)
 {
        char *key = NULL;
-       guint handler = 0;
 
        mc_retvm_if(listener_list == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "listener_list is NULL");
        mc_retvm_if(connection == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "connection is NULL");
@@ -190,14 +189,19 @@ int mc_ipc_register_listener(GList **listener_list, GDBusConnection *connection,
                return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
        }
 
-       handler = _mc_ipc_signal_subscribe(connection, interface_name, signal_name, listener_list);
+       listener->handler = _mc_ipc_signal_subscribe(connection, interface_name, signal_name, listener_list);
+       if (listener->handler == 0) {
+               mc_error("Error signal subscribe");
+               MC_SAFE_G_FREE(key);
+               MC_SAFE_G_FREE(listener);
+               return MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
+       }
 
        listener->dbus_conn = connection;
        listener->interface_name = strdup(interface_name);
        listener->signal_name = strdup(signal_name);
        listener->callback = callback;
        listener->user_data = user_data;
-       listener->handler = handler;
        listener->key = key;
 
        (*listener_list) = g_list_append(*listener_list, listener);