Skip cleanup in DllMain on process termination

wopss · wopss · commit 3135aa509dcc · 2026-01-21T09:15:51.000+02:00
diff --git a/src/dll/Main.cpp b/src/dll/Main.cpp
@@ -36,6 +36,13 @@ BOOL APIENTRY DllMain(HMODULE aModule, DWORD aReason, LPVOID aReserved)
     }
     case DLL_PROCESS_DETACH:
     {
+        if (aReserved != nullptr)
+        {
+            // DLL is being unloaded due to process termination, skip cleanup.
+            // https://learn.microsoft.com/en-us/windows/win32/dlls/dllmain
+            break;
+        }
+
         try
         {
             const auto image = Image::Get();

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,13 @@ BOOL APIENTRY DllMain(HMODULE aModule, DWORD aReason, LPVOID aReserved)`
`36`	`36`	`}`
`37`	`37`	`case DLL_PROCESS_DETACH:`
`38`	`38`	`{`
	`39`	`+ if (aReserved != nullptr)`
	`40`	`+ {`
	`41`	`+ // DLL is being unloaded due to process termination, skip cleanup.`
	`42`	`+ // https://learn.microsoft.com/en-us/windows/win32/dlls/dllmain`
	`43`	`+ break;`
	`44`	`+ }`
	`45`	`+`
`39`	`46`	`try`
`40`	`47`	`{`
`41`	`48`	`const auto image = Image::Get();`