From f9fe8901aeb48a24c1434bf7e4d68a9646e6aa5d Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Mon, 25 Mar 2019 16:48:17 +0900 Subject: [PATCH] Fix crash when assistant provides no wakeup engine info Change-Id: Ibc6405815abee190fba0866cbddee9e86f11214c --- src/multi_assistant_service.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/multi_assistant_service.c b/src/multi_assistant_service.c index c35f75a..c70db08 100644 --- a/src/multi_assistant_service.c +++ b/src/multi_assistant_service.c @@ -444,8 +444,13 @@ int __mas_assistant_info_cb(const char* appid, const char* name, } MAS_LOGD("wakeup_engine(%s)", wakeup_engine); - strncpy(g_maclient_info[index].wakeup_engine, wakeup_engine, MAX_APPID_LEN); - g_maclient_info[index].wakeup_engine[MAX_APPID_LEN - 1] = '\0'; + if (wakeup_engine) { + strncpy(g_maclient_info[index].wakeup_engine, wakeup_engine, MAX_APPID_LEN); + g_maclient_info[index].wakeup_engine[MAX_APPID_LEN - 1] = '\0'; + } else { + g_maclient_info[index].wakeup_engine[0] = '\0'; + MAS_LOGW("Wakeup engine information not provided for : %s", appid); + } } else { MAS_LOGD("Couldn't find an empty slot for storing assistant info"); } -- 2.34.1