Fix to call CoreRuntime dispose()

Change-Id: I33f4a07bee4b69195f331952acb699b39e17c9e9

diff --git a/NativeLauncher/launcher/exec/launcher.cc b/NativeLauncher/launcher/exec/launcher.cc
index 84afd914ccf165cea026bc0191fad5c016339ac8..f90650cf5be945b66b927056396b0a0dd5765671 100644 (file)
--- 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<CoreRuntime> 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 dda9368dbac916cdc343c9519f91947a9d5bbcae..27602b844b0d2aa96c843f9b6debc2b2604a31fc 100644 (file)
--- 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[])