From 35c19d4ab35ffac32399299fdbd12b7b78c5ac5c Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Fri, 20 Sep 2019 20:50:29 +0900 Subject: [PATCH] Fix defects detected by static analysis tool Change-Id: Ia6e40f9bef97c20b127393587d4ed3c268e18d6e --- src/multi_assistant_service.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/multi_assistant_service.c b/src/multi_assistant_service.c index c05726d..773cb7d 100644 --- a/src/multi_assistant_service.c +++ b/src/multi_assistant_service.c @@ -455,8 +455,12 @@ int mas_client_set_preprocessing_allow_mode(int pid, int mode, const char* appid if (g_maclient_info[loop].used) { if (pid_appid && strncmp(pid_appid, g_maclient_info[loop].appid, MAX_APPID_LEN) == 0) { g_maclient_info[loop].preprocessing_allow_mode = mode; - strncpy(g_maclient_info[loop].preprocessing_allow_appid, appid, MAX_APPID_LEN); - g_maclient_info[loop].preprocessing_allow_appid[MAX_APPID_LEN - 1] = '\0'; + if (appid) { + strncpy(g_maclient_info[loop].preprocessing_allow_appid, appid, MAX_APPID_LEN); + g_maclient_info[loop].preprocessing_allow_appid[MAX_APPID_LEN - 1] = '\0'; + } else { + g_maclient_info[loop].preprocessing_allow_appid[0] = '\0'; + } } } } @@ -1018,7 +1022,7 @@ int mas_process_voice_key_event(bool pressed) ma_preprocessing_allow_mode_e get_preprocessing_allow_mode(const char* appid) { for (int loop = 0; loop < MAX_MACLIENT_INFO_NUM; loop++) { - if (g_maclient_info[loop].used) { + if (appid && g_maclient_info[loop].used) { if (strncmp(appid, g_maclient_info[loop].appid, MAX_APPID_LEN) == 0) { return g_maclient_info[loop].preprocessing_allow_mode; } -- 2.34.1