[WGID : 154370] Fix Svace issue

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I4edad1cba7eb7e5b89bbcadf25bb90918cbc5572

diff --git a/src/daemon/mtp_daemon_event.c b/src/daemon/mtp_daemon_event.c
index ee585f4..e037996 100755 (executable)
--- a/src/daemon/mtp_daemon_event.c
+++ b/src/daemon/mtp_daemon_event.c
@@ -337,7 +337,12 @@ static void* __event_thread(gpointer dev, gpointer data)
        MTP_LOGI("Event loop is started");
 
        device_id = mtp_daemon_util_get_device_id(device, mtp_ctx);
+       if (device_id < 0)
+               return NULL;
+
        device_info = mtp_ctx->device_list->device_info_list[device_id];
+       if (device_info == NULL)
+               return NULL;
 
        mtp_daemon_gdbus_emit_event(MTP_INITIATOR_EVENT_DEVICE_ADDED, device_id, mtp_ctx);
 
@@ -381,20 +386,17 @@ static void* __event_thread(gpointer dev, gpointer data)
        mtp_daemon_gdbus_emit_event(MTP_INITIATOR_EVENT_DEVICE_REMOVED, device_id, mtp_ctx);
 
        /* remove the device into device list */
+       MTP_LOGI("remove device from the list!!");
 
-       if (device_id >= 0) {
-               MTP_LOGI("remove device from the list!!");
-
-               mtp_ctx->device_list->device_num--;
+       mtp_ctx->device_list->device_num--;
 
-               LIBMTP_Release_Device(device_info->device);
-               mtp_daemon_db_delete(device_id, 0, 0, mtp_ctx);
+       LIBMTP_Release_Device(device_info->device);
+       mtp_daemon_db_delete(device_id, 0, 0, mtp_ctx);
 
-               g_free(device_info->model_name);
-               g_free(device_info);
+       g_free(device_info->model_name);
+       g_free(device_info);
 
-               mtp_ctx->device_list->device_info_list[device_id] = NULL;
-       }
+       mtp_ctx->device_list->device_info_list[device_id] = NULL;
 
        /* TODO : deactivate signal to clients using g_idle_add */
        __print_device_list(mtp_ctx);