From 8846e4d46fef0c90ed4805b776c1b900ff97b2eb Mon Sep 17 00:00:00 2001
From: Decaf Code <git@decafcode.org>
Date: Wed, 27 Feb 2019 20:37:22 -0500
Subject: [PATCH] inject: Detect remote LoadLibrary failure

---
 inject/main.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/inject/main.c b/inject/main.c
index 6025d1b..a5295ad 100644
--- a/inject/main.c
+++ b/inject/main.c
@@ -125,6 +125,7 @@ static HRESULT inject_dll(HANDLE process, const char *dll_name)
     void *remote_addr;
     HANDLE remote_thread;
     DWORD found;
+    DWORD result;
     HRESULT hr;
     BOOL ok;
 
@@ -186,11 +187,38 @@ static HRESULT inject_dll(HANDLE process, const char *dll_name)
         goto end;
     }
 
+    result = WaitForSingleObject(remote_thread, INFINITE);
+
+    if (result != WAIT_OBJECT_0) {
+        hr = HRESULT_FROM_WIN32(GetLastError());
+        fprintf(stderr, "WaitForSingleObject failed: %x\n", (int) hr);
+
+        goto end;
+    }
+
+    /* Reusing `result` var for something unrelated.. ech. sloppy. */
+    ok = GetExitCodeThread(remote_thread, &result);
+
+    if (!ok) {
+        hr = HRESULT_FROM_WIN32(GetLastError());
+        fprintf(stderr, "GetExitCodeThread failed: %x\n", (int) hr);
+
+        goto end;
+    }
+
+    if (result == 0) {
+        hr = E_FAIL;
+        fprintf(stderr,
+                "%s: DLL failed to load inside target process\n",
+                dll_name);
+
+        goto end;
+    }
+
     hr = S_OK;
 
 end:
     if (remote_thread != NULL) {
-        WaitForSingleObject(remote_thread, INFINITE);
         CloseHandle(remote_thread);
     }