check runtime initialize before launch application to avoid crash

Change-Id: I142bd6f5ab42414d0f9183535751143a3e20d3e3

diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
index 6ae5ad5..2b2006c 100644 (file)
--- a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
+++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
@@ -91,7 +91,8 @@ CoreRuntime::CoreRuntime(const char* mode) :
        __hostHandle(nullptr),
        __domainId(-1),
        fd(0),
-       __mode(mode)
+       __mode(mode),
+       __initialized(false)
 {
        _DBG("Constructor called!!");
 
@@ -185,6 +186,8 @@ int CoreRuntime::initialize(bool standalone)
                return -1;
        }
 
+       __initialized = true;
+
        return 0;
 }
 
@@ -255,9 +258,14 @@ void CoreRuntime::dispose()
 
 int CoreRuntime::launch(const char* appId, const char* root, const char* path, int argc, char* argv[])
 {
+       if (!__initialized) {
+               _ERR("Runtime is not initialized");
+               return -1;
+       }
+
        if (path == nullptr) {
                _ERR("executable path is null");
-               return -11;
+               return -1;
        }
 
        if (!isFileExist(path)) {

diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.h b/NativeLauncher/launcher/dotnet/dotnet_launcher.h
index 82052f2..647640a 100644 (file)
--- a/NativeLauncher/launcher/dotnet/dotnet_launcher.h
+++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.h
@@ -46,6 +46,7 @@ class CoreRuntime
                unsigned int __domainId;
                int fd;
                const char* __mode;
+               bool __initialized;
 };
 
 }  // dotnetcore