Free unused trampoline regions on abort

m417z · m417z · commit 4fefbbb5f6a0 · 2025-04-06T23:13:37.000+03:00
Similar to the implementation in SlimDetoursTransactionCommit.
diff --git a/Source/SlimDetours/Transaction.c b/Source/SlimDetours/Transaction.c
@@ -98,6 +98,7 @@ SlimDetoursTransactionAbort(VOID)
     PVOID pMem;
     SIZE_T sMem;
     DWORD dwOld;
+    BOOL freed = FALSE;
 
     if (s_nPendingThreadId != NtCurrentThreadId())
     {
@@ -115,13 +116,18 @@ SlimDetoursTransactionAbort(VOID)
         {
             detour_free_trampoline(o->pTrampoline);
             o->pTrampoline = NULL;
+            freed = TRUE;
         }
 
         PDETOUR_OPERATION n = o->pNext;
         detour_memory_free(o);
         o = n;
     }
     s_pPendingOperations = NULL;
+    if (freed)
+    {
+        detour_free_unused_trampoline_regions();
+    }
 
     // Make sure the trampoline pages are no longer writable.
     detour_runnable_trampoline_regions();

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ SlimDetoursTransactionAbort(VOID)`
`98`	`98`	`PVOID pMem;`
`99`	`99`	`SIZE_T sMem;`
`100`	`100`	`DWORD dwOld;`
	`101`	`+ BOOL freed = FALSE;`
`101`	`102`
`102`	`103`	`if (s_nPendingThreadId != NtCurrentThreadId())`
`103`	`104`	`{`
`@@ -115,13 +116,18 @@ SlimDetoursTransactionAbort(VOID)`
`115`	`116`	`{`
`116`	`117`	`detour_free_trampoline(o->pTrampoline);`
`117`	`118`	`o->pTrampoline = NULL;`
	`119`	`+ freed = TRUE;`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`PDETOUR_OPERATION n = o->pNext;`
`121`	`123`	`detour_memory_free(o);`
`122`	`124`	`o = n;`
`123`	`125`	`}`
`124`	`126`	`s_pPendingOperations = NULL;`
	`127`	`+ if (freed)`
	`128`	`+ {`
	`129`	`+ detour_free_unused_trampoline_regions();`
	`130`	`+ }`
`125`	`131`
`126`	`132`	`// Make sure the trampoline pages are no longer writable.`
`127`	`133`	`detour_runnable_trampoline_regions();`