Update SlimDetours to the following custom version:

Commit:
https://github.com/KNSoft/KNSoft.SlimDetours/tree/4cc236ae98ef10788da7a2b08aaf3bf660281bca

Unmerged PRs:
KNSoft/KNSoft.SlimDetours#8
KNSoft/KNSoft.SlimDetours#9 (Updated)
KNSoft/KNSoft.SlimDetours#10
KNSoft/KNSoft.SlimDetours#11
KNSoft/KNSoft.SlimDetours#16

Author: m417z

src/SlimDetours/Disassembler.c

@@ -1058,9 +1058,9 @@ Invalid(
     UNREFERENCED_PARAMETER(pDisasm);
     UNREFERENCED_PARAMETER(pEntry);
     UNREFERENCED_PARAMETER(pbDst);
+    UNREFERENCED_PARAMETER(pbSrc);
 
-    ASSERT(!"Invalid Instruction");
-    return pbSrc + 1;
+    return NULL;
 }
 
 static

src/SlimDetours/Thread.c

@@ -7,24 +7,26 @@
 #include "SlimDetours.inl"
 
 #define THREAD_ACCESS (THREAD_QUERY_LIMITED_INFORMATION | THREAD_SUSPEND_RESUME | THREAD_GET_CONTEXT | THREAD_SET_CONTEXT)
-#define INITIAL_THREAD_CAPACITY 128
+
+static HANDLE s_Handles[32];
 
 NTSTATUS
 detour_thread_suspend(
     _Outptr_result_maybenull_ PHANDLE* SuspendedHandles,
     _Out_ PULONG SuspendedHandleCount)
 {
     NTSTATUS Status;
-    PHANDLE Buffer = NULL;
-    ULONG BufferCapacity = 0;
+    PHANDLE Buffer = s_Handles;
+    ULONG BufferCapacity = ARRAYSIZE(s_Handles);
     ULONG SuspendedCount = 0;
+    BOOL CurrentThreadSkipped = FALSE;
     HANDLE CurrentTID = (HANDLE)(ULONG_PTR)NtCurrentThreadId();
     BOOL ClosePrevThread = FALSE;
     HANDLE ThreadHandle = NULL;
     while (TRUE)
     {
-        HANDLE hNextThread;
-        Status = NtGetNextThread(NtCurrentProcess(), ThreadHandle, THREAD_ACCESS, 0, 0, &hNextThread);
+        HANDLE NextThreadHandle;
+        Status = NtGetNextThread(NtCurrentProcess(), ThreadHandle, THREAD_ACCESS, 0, 0, &NextThreadHandle);
         if (ClosePrevThread)
         {
             NtClose(ThreadHandle);
@@ -39,25 +41,29 @@ detour_thread_suspend(
             break;
         }
 
-        ThreadHandle = hNextThread;
+        ThreadHandle = NextThreadHandle;
         ClosePrevThread = TRUE;
 
-        THREAD_BASIC_INFORMATION BasicInformation;
-        if (!NT_SUCCESS(NtQueryInformationThread(
-            ThreadHandle,
-            ThreadBasicInformation,
-            &BasicInformation,
-            sizeof(BasicInformation),
-            NULL
-        )))
+        if (!CurrentThreadSkipped)
         {
-            continue;
-        }
+            THREAD_BASIC_INFORMATION BasicInformation;
+            if (!NT_SUCCESS(NtQueryInformationThread(
+                ThreadHandle,
+                ThreadBasicInformation,
+                &BasicInformation,
+                sizeof(BasicInformation),
+                NULL
+            )))
+            {
+                continue;
+            }
 
-        /* Skip the current thread */
-        if (BasicInformation.ClientId.UniqueThread == CurrentTID)
-        {
-            continue;
+            /* Skip the current thread */
+            if (BasicInformation.ClientId.UniqueThread == CurrentTID)
+            {
+                CurrentThreadSkipped = TRUE;
+                continue;
+            }
         }
 
         if (!NT_SUCCESS(NtSuspendThread(ThreadHandle, NULL)))
@@ -68,18 +74,19 @@ detour_thread_suspend(
         ClosePrevThread = FALSE;
 
         Status = STATUS_SUCCESS;
-        if (Buffer == NULL)
+        if (SuspendedCount >= BufferCapacity)
         {
-            BufferCapacity = INITIAL_THREAD_CAPACITY;
-            Buffer = (PHANDLE)detour_memory_alloc(BufferCapacity * sizeof(HANDLE));
-            if (Buffer == NULL)
+            BufferCapacity *= 2;
+
+            PHANDLE p;
+            if (Buffer == s_Handles)
             {
-                Status = STATUS_NO_MEMORY;
+                p = (PHANDLE)detour_memory_alloc(BufferCapacity * sizeof(HANDLE));
+            } else
+            {
+                p = (PHANDLE)detour_memory_realloc(Buffer, BufferCapacity * sizeof(HANDLE));
             }
-        } else if (SuspendedCount >= BufferCapacity)
-        {
-            BufferCapacity *= 2;
-            LPHANDLE p = (PHANDLE)detour_memory_realloc(Buffer, BufferCapacity * sizeof(HANDLE));
+
             if (p)
             {
                 Buffer = p;
@@ -106,17 +113,20 @@ detour_thread_suspend(
         Buffer[SuspendedCount++] = ThreadHandle;
     }
 
-    if (!NT_SUCCESS(Status) && Buffer != NULL)
+    if (!NT_SUCCESS(Status))
     {
         for (UINT i = 0; i < SuspendedCount; ++i)
         {
             NtResumeThread(Buffer[i], NULL);
             NtClose(Buffer[i]);
         }
 
-        detour_memory_free(Buffer);
-        Buffer = NULL;
+        if (Buffer != s_Handles)
+        {
+            detour_memory_free(Buffer);
+        }
 
+        Buffer = NULL;
         SuspendedCount = 0;
     }
 
@@ -138,7 +148,11 @@ detour_thread_resume(
         NtResumeThread(SuspendedHandles[i], NULL);
         NtClose(SuspendedHandles[i]);
     }
-    detour_memory_free(SuspendedHandles);
+
+    if (SuspendedHandles != s_Handles)
+    {
+        detour_memory_free(SuspendedHandles);
+    }
 }
 
 NTSTATUS

src/SlimDetours/Transaction.c

@@ -414,6 +414,13 @@ SlimDetoursAttach(
 
         DETOUR_TRACE(" SlimDetoursCopyInstruction(%p,%p)\n", pbTrampoline, pbSrc);
         pbSrc = (PBYTE)SlimDetoursCopyInstruction(pbTrampoline, pbSrc, NULL, &lExtra);
+        if (pbSrc == NULL)
+        {
+            Status = STATUS_ILLEGAL_INSTRUCTION;
+            DETOUR_BREAK();
+            goto fail;
+        }
+
         DETOUR_TRACE(" SlimDetoursCopyInstruction() = %p (%d bytes)\n", pbSrc, (int)(pbSrc - pbOp));
         pbTrampoline += (pbSrc - pbOp) + lExtra;
         cbTarget = PtrOffset(pbTarget, pbSrc);