ntdll: Catch the exceptions in the TLS callback like Windows does.

e8bba26c · Dmitry Timoshkov · Alexandre Julliard · 2f7b91d7 · e8bba26c
Commit e8bba26c authored Mar 13, 2007 by Dmitry Timoshkov Committed by Alexandre Julliard Mar 13, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

loader.c dlls/ntdll/loader.c +12 -1

No files found.
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -798,7 +798,18 @@ static void call_tls_callbacks( HMODULE module, UINT reason )
        if (TRACE_ON(relay))
            DPRINTF("%04x:Call TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n",
                    GetCurrentThreadId(), *callback, module, reason_names[reason] );
-        (*callback)( module, reason, NULL );
+        __TRY
+        {
+            (*callback)( module, reason, NULL );
+        }
+        __EXCEPT(NULL)
+        {
+            if (TRACE_ON(relay))
+                DPRINTF("%04x:exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n",
+                        GetCurrentThreadId(), callback, module, reason_names[reason] );
+            return;
+        }
+        __ENDTRY
        if (TRACE_ON(relay))
            DPRINTF("%04x:Ret  TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n",
                    GetCurrentThreadId(), *callback, module, reason_names[reason] );