From b6945fa0b3451bf8fc9f3132b2d9ae19d14e5ebb Mon Sep 17 00:00:00 2001 From: ulgal-park Date: Tue, 14 Mar 2023 21:19:13 +0900 Subject: [PATCH] add guard clause when use tidl info Change-Id: If1b530d30def44840a7f56238bab420bcc65f5fd --- client/vc_mgr_tidl.c | 6 ++++++ client/vc_widget_tidl.c | 6 ++++++ server/vcd_tidl.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/client/vc_mgr_tidl.c b/client/vc_mgr_tidl.c index 4d1937c..a4cec35 100644 --- a/client/vc_mgr_tidl.c +++ b/client/vc_mgr_tidl.c @@ -277,6 +277,8 @@ static void __send_buffer_cb(void *user_data, rpc_port_proxy_vc_mgr_proxy_array_ static void __on_connected(rpc_port_proxy_vc_mgr_proxy_vc_mgr_h h, void *user_data) { + RETM_IF(NULL == g_proxy_tidl_info, TAG_VCM, "[ERROR] Fail to get tidl info"); + g_proxy_tidl_info->connected = true; g_proxy_tidl_info->connection_requesting = false; g_proxy_tidl_info->register_callback_invoked = false; @@ -286,6 +288,8 @@ static void __on_connected(rpc_port_proxy_vc_mgr_proxy_vc_mgr_h h, void *user_da static void __on_disconnected(rpc_port_proxy_vc_mgr_proxy_vc_mgr_h h, void *user_data) { + RETM_IF(NULL == g_proxy_tidl_info, TAG_VCM, "[ERROR] Fail to get tidl info"); + g_proxy_tidl_info->connected = false; g_proxy_tidl_info->connection_requesting = false; g_proxy_tidl_info->register_callback_invoked = false; @@ -297,6 +301,8 @@ static void __on_disconnected(rpc_port_proxy_vc_mgr_proxy_vc_mgr_h h, void *user static void __on_rejected(rpc_port_proxy_vc_mgr_proxy_vc_mgr_h h, void *user_data) { + RETM_IF(NULL == g_proxy_tidl_info, TAG_VCM, "[ERROR] Fail to get tidl info"); + g_proxy_tidl_info->connection_requesting = false; g_proxy_tidl_info->register_callback_invoked = false; diff --git a/client/vc_widget_tidl.c b/client/vc_widget_tidl.c index d6fbbc9..b099088 100644 --- a/client/vc_widget_tidl.c +++ b/client/vc_widget_tidl.c @@ -144,6 +144,8 @@ static void __notify_cb(void *user_data, bundle *msg) static void __on_connected(rpc_port_proxy_vc_widget_proxy_vc_widget_h h, void *user_data) { + RETM_IF(NULL == g_proxy_tidl_info, TAG_VCW, "[ERROR] Fail to get tidl info"); + g_proxy_tidl_info->connected = true; g_proxy_tidl_info->connection_requesting = false; g_proxy_tidl_info->register_callback_invoked = false; @@ -153,6 +155,8 @@ static void __on_connected(rpc_port_proxy_vc_widget_proxy_vc_widget_h h, void *u static void __on_disconnected(rpc_port_proxy_vc_widget_proxy_vc_widget_h h, void *user_data) { + RETM_IF(NULL == g_proxy_tidl_info, TAG_VCW, "[ERROR] Fail to get tidl info"); + g_proxy_tidl_info->connected = false; g_proxy_tidl_info->connection_requesting = false; g_proxy_tidl_info->register_callback_invoked = false; @@ -164,6 +168,8 @@ static void __on_disconnected(rpc_port_proxy_vc_widget_proxy_vc_widget_h h, void static void __on_rejected(rpc_port_proxy_vc_widget_proxy_vc_widget_h h, void *user_data) { + RETM_IF(NULL == g_proxy_tidl_info, TAG_VCW, "[ERROR] Fail to get tidl info"); + g_proxy_tidl_info->connection_requesting = false; g_proxy_tidl_info->register_callback_invoked = false; diff --git a/server/vcd_tidl.c b/server/vcd_tidl.c index 0940cd0..bef79d8 100644 --- a/server/vcd_tidl.c +++ b/server/vcd_tidl.c @@ -1378,6 +1378,11 @@ static void __widget_on_connected(rpc_port_proxy_vcd_widget_proxy_vcd_widget_h h int pid = (intptr_t)user_data; widget_tidl_info_s* widget_tidl_info = vcd_client_widget_get_tidl_info(pid); + if (NULL == widget_tidl_info) { + SLOG(LOG_ERROR, TAG_VCD, "[TIDL] tidl proxy info not allocated"); + return; + } + widget_tidl_info->connected = true; widget_tidl_info->connection_requesting = false; @@ -1389,6 +1394,11 @@ static void __widget_on_disconnected(rpc_port_proxy_vcd_widget_proxy_vcd_widget_ int pid = (intptr_t)user_data; widget_tidl_info_s* widget_tidl_info = vcd_client_widget_get_tidl_info(pid); + if (NULL == widget_tidl_info) { + SLOG(LOG_ERROR, TAG_VCD, "[TIDL] tidl proxy info not allocated"); + return; + } + widget_tidl_info->connected = false; widget_tidl_info->connection_requesting = false; @@ -1400,6 +1410,11 @@ static void __widget_on_rejected(rpc_port_proxy_vcd_widget_proxy_vcd_widget_h h, int pid = (intptr_t)user_data; widget_tidl_info_s* widget_tidl_info = vcd_client_widget_get_tidl_info(pid); + if (NULL == widget_tidl_info) { + SLOG(LOG_ERROR, TAG_VCD, "[TIDL] tidl proxy info not allocated"); + return; + } + widget_tidl_info->connection_requesting = false; SLOG(LOG_ERROR, TAG_VCD, "[ERROR] Rejected from widget"); -- 2.7.4