From 927e64b2ac12f80b3fd3ca22f4fca3d211b6b734 Mon Sep 17 00:00:00 2001 From: Hyungju Lee Date: Tue, 21 Apr 2020 11:16:38 +0900 Subject: [PATCH] Fix to call CoreRuntime dispose() Change-Id: I33f4a07bee4b69195f331952acb699b39e17c9e9 --- NativeLauncher/launcher/exec/launcher.cc | 2 +- NativeLauncher/launcher/exec/loader.cc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NativeLauncher/launcher/exec/launcher.cc b/NativeLauncher/launcher/exec/launcher.cc index 84afd91..f90650c 100644 --- a/NativeLauncher/launcher/exec/launcher.cc +++ b/NativeLauncher/launcher/exec/launcher.cc @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) } } - CoreRuntime* runtime = new CoreRuntime("standalone"); + std::unique_ptr runtime(new CoreRuntime("standalone")); // get app ID and app root path if (AUL_R_OK == aul_app_get_appid_bypid(getpid(), appId, sizeof(appId))) { diff --git a/NativeLauncher/launcher/exec/loader.cc b/NativeLauncher/launcher/exec/loader.cc index dda9368..27602b8 100644 --- a/NativeLauncher/launcher/exec/loader.cc +++ b/NativeLauncher/launcher/exec/loader.cc @@ -190,7 +190,10 @@ extern "C" int realMain(int argc, char *argv[], const char* mode) .remove_fd = __adapter_remove_fd }; - return launchpad_loader_main(argc, argv, &callbacks, &adapter, runtime); + int ret = launchpad_loader_main(argc, argv, &callbacks, &adapter, runtime); + delete runtime; + + return ret; } int main(int argc, char *argv[]) -- 2.7.4