Add NULL check when prelaunching default assistant 37/234337/1
authorJi-hoon Lee <dalton.lee@samsung.com>
Mon, 25 May 2020 12:49:30 +0000 (21:49 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Mon, 25 May 2020 12:49:30 +0000 (21:49 +0900)
Change-Id: Id8d6fa2323000101f4edd8ce33ab99d1bb8cae29

src/service_main.cpp

index 966c336918055755e08c328b6b3d5538e66021d4..4dda21b743f3a2ddbfd8340f74fb572ff73a4a0f 100644 (file)
@@ -950,7 +950,8 @@ int CServiceMain::prelaunch_default_assistant()
        if (prelaunch_mode && *prelaunch_mode) {
                const char *default_assistant = NULL;
                if (0 == mServicePlugin.get_default_assistant(&default_assistant)) {
-                       if (!(mApplicationManager.is_application_running(default_assistant))) {
+                       if (default_assistant &&
+                               !(mApplicationManager.is_application_running(default_assistant))) {
                                MAS_LOGD("prelaunching default_assistant_appid : %s", default_assistant);
                                launch_client_by_appid(default_assistant, CLIENT_LAUNCH_MODE_PRELAUNCH);
                        }