Check if instance is NULL before emitting signal

Change-Id: I4bd460b54b5f81396c085aa49633273701df3268
Signed-off-by: Cheoleun Moon <chleun.moon@samsung.com>

diff --git a/src/asp-manager-gdbus.c b/src/asp-manager-gdbus.c
index f93f040..d2d5112 100755 (executable)
--- a/src/asp-manager-gdbus.c
+++ b/src/asp-manager-gdbus.c
@@ -135,7 +135,7 @@ static gboolean __asp_manager_gdbus_advertise_service(AspService *object,
        service.service_info_map = NULL;
 
        g_variant_get(parameters, "a{sv}", &iter);
-       if(!iter) {
+       if (!iter) {
                ASP_LOGE("Failed to get iter");
                ASP_RETURN_SERVICE_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
                __ASP_LOG_FUNC_EXIT__;
@@ -211,7 +211,7 @@ static gboolean __asp_manager_gdbus_service_status_change(AspService *object,
 
        memset(&service, 0, sizeof(asp_service_advertise_s));
        g_variant_get(parameters, "a{sv}", &iter);
-       if(!iter) {
+       if (!iter) {
                ASP_LOGE("Failed to get iter");
                ASP_RETURN_SERVICE_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
                __ASP_LOG_FUNC_EXIT__;
@@ -331,7 +331,7 @@ static gboolean __asp_manager_gdbus_seek_service(AspService *object,
        service.service_info_map = NULL;
 
        g_variant_get(parameters, "a{sv}", &iter);
-       if(!iter) {
+       if (!iter) {
                ASP_LOGE("Failed to get iter");
                ASP_RETURN_SERVICE_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
                __ASP_LOG_FUNC_EXIT__;
@@ -501,7 +501,7 @@ static gboolean __asp_manager_gdbus_connect_session(AspSession *object,
        DEBUG_PARAMS(parameters);
 
        g_variant_get(parameters, "a{sv}", &iter);
-       if(!iter) {
+       if (!iter) {
                ASP_LOGE("Failed to get iter");
                ASP_RETURN_SERVICE_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
                __ASP_LOG_FUNC_EXIT__;
@@ -615,7 +615,7 @@ static gboolean __asp_manager_gdbus_confirm_session(AspSession *object,
        DEBUG_PARAMS(parameters);
 
        g_variant_get(parameters, "a{sv}", &iter);
-       if(!iter) {
+       if (!iter) {
                ASP_LOGE("Failed to get iter");
                ASP_RETURN_SERVICE_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
                __ASP_LOG_FUNC_EXIT__;
@@ -840,7 +840,7 @@ static gboolean __asp_manager_gdbus_bound_port(AspSession *object,
        DEBUG_PARAMS(parameters);
 
        g_variant_get(parameters, "a{sv}", &iter);
-       if(!iter) {
+       if (!iter) {
                ASP_LOGE("Failed to get iter");
                ASP_RETURN_SERVICE_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
                __ASP_LOG_FUNC_EXIT__;
@@ -921,7 +921,7 @@ static gboolean __asp_manager_gdbus_release_port(AspSession *object,
        DEBUG_PARAMS(parameters);
 
        g_variant_get(parameters, "a{sv}", &iter);
-       if(!iter) {
+       if (!iter) {
                ASP_LOGE("Failed to get iter");
                ASP_RETURN_SERVICE_ERR(invocation, -ASP_ERROR_OPERATION_FAILED);
                __ASP_LOG_FUNC_EXIT__;
@@ -1135,7 +1135,11 @@ void asp_manager_gdbus_notify_advertise_status(guint32 adv_id, guint8 status, gi
        __ASP_LOG_FUNC_ENTER__;
 
        AspService *service = asp_get_manager()->service_obj;
-       asp_service_emit_advertise_status_changed(service, adv_id, status, reason);
+       if (service) {
+               asp_service_emit_advertise_status_changed(service, adv_id, status, reason);
+       } else {
+               ASP_LOGE("ERROR: service obj is NULL");
+       }
 
        __ASP_LOG_FUNC_EXIT__;
 }
@@ -1179,7 +1183,12 @@ void asp_manager_gdbus_notify_search_result(guint32 search_id,
        g_variant_builder_unref(builder);
 
        ASP_LOGD("Created parameter for search result signal");
-       asp_service_emit_search_result(service, params);
+
+       if (service) {
+               asp_service_emit_search_result(service, params);
+       } else {
+               ASP_LOGE("ERROR: service obj is NULL");
+       }
 
        __ASP_LOG_FUNC_EXIT__;
 }
@@ -1209,7 +1218,11 @@ void asp_manager_gdbus_notify_session_request(gint32 error_code,
        g_variant_builder_unref(builder);
 
        ASP_LOGD("Created parameter for session requested signal");
-       asp_session_emit_session_request(session, params);
+       if (session) {
+               asp_session_emit_session_request(session, params);
+       } else {
+               ASP_LOGE("ERROR: session obj is NULL");
+       }
 
        __ASP_LOG_FUNC_EXIT__;
 }
@@ -1234,7 +1247,11 @@ void asp_manager_gdbus_notify_session_config_request(gchar * session_mac,
        g_variant_builder_unref(builder);
 
        ASP_LOGD("Created parameter for session config requested signal");
-       asp_session_emit_session_config_request(session, params);
+       if (session) {
+               asp_session_emit_session_config_request(session, params);
+       } else {
+               ASP_LOGE("ERROR: session obj is NULL");
+       }
 
        __ASP_LOG_FUNC_EXIT__;
 }
@@ -1258,7 +1275,11 @@ void asp_manager_gdbus_notify_connect_status(gchar *session_mac,
        g_variant_builder_unref(builder);
 
        ASP_LOGD("Created parameter for connect status signal");
-       asp_session_emit_connect_status(session, params);
+       if (session) {
+               asp_session_emit_connect_status(session, params);
+       } else {
+               ASP_LOGE("ERROR: session obj is NULL");
+       }
 
        __ASP_LOG_FUNC_EXIT__;
 }
@@ -1284,7 +1305,11 @@ void asp_manager_gdbus_notify_session_status(gchar *session_mac,
        g_variant_builder_unref(builder);
 
        ASP_LOGD("Created parameter for session status signal");
-       asp_session_emit_session_status(session, params);
+       if (session) {
+               asp_session_emit_session_status(session, params);
+       } else {
+               ASP_LOGE("ERROR: session obj is NULL");
+       }
 
        __ASP_LOG_FUNC_EXIT__;
 }
@@ -1311,7 +1336,11 @@ void asp_manager_gdbus_notify_port_status(gchar * session_mac,
        g_variant_builder_unref(builder);
 
        ASP_LOGD("Created parameter for port status signal");
-       asp_session_emit_port_status(session, params);
+       if (session) {
+               asp_session_emit_port_status(session, params);
+       } else {
+               ASP_LOGE("ERROR: session obj is NULL");
+       }
 
        __ASP_LOG_FUNC_EXIT__;
 }

diff --git a/src/session/asp-session.c b/src/session/asp-session.c
index 7f00699..2928f6a 100644 (file)
--- a/src/session/asp-session.c
+++ b/src/session/asp-session.c
@@ -921,7 +921,7 @@ void asp_session_recv_req(GSocketAddress *sock_addr, gpointer p_msg)
                return;
        }
 
-       if(session && session->over_p2p && session->sock_addr == NULL) {
+       if (session && session->over_p2p && session->sock_addr == NULL) {
                ASP_LOGD("IpAssigned signal isn't yet received, discard event");
                return;
        }