Fix exitCode from ExecuteAssembly

ExecuteAssembly is initializing exitCode to 0 on entrance to the function.  If it then fails prior to exitCode being set when invoking the entry point, the exitCode remains 0 even though there was a failure, and corerun ends up returning a successful exit code.

diff --git a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
index e7323c1..4f6ffa0 100644 (file)
--- a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
+++ b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
@@ -290,6 +290,7 @@ int ExecuteManagedAssembly(
             if (!SUCCEEDED(st))
             {
                 fprintf(stderr, "ExecuteAssembly failed - status: 0x%08x\n", st);
+                exitCode = -1;
             }
         }
         else

diff --git a/src/dlls/mscoree/unixinterface.cpp b/src/dlls/mscoree/unixinterface.cpp
index 2eaa1b8..1cd9d67 100644 (file)
--- a/src/dlls/mscoree/unixinterface.cpp
+++ b/src/dlls/mscoree/unixinterface.cpp
@@ -124,7 +124,11 @@ HRESULT ExecuteAssembly(
             LPCSTR entryPointMethodName,
             DWORD* exitCode)
 {
-    *exitCode = 0;
+    if (exitCode == NULL)
+    {
+        return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER);
+    }
+    *exitCode = -1;
 
     DWORD error = PAL_InitializeCoreCLR(exePath, coreClrPath, true);
     HRESULT hr = HRESULT_FROM_WIN32(error);