msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH.

def75635 · Maxime Bellengé · Alexandre Julliard · 85128db3 · def75635
Commit def75635 authored Dec 26, 2005 by Maxime Bellengé Committed by Alexandre Julliard Dec 26, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

main.c dlls/msvcrt/main.c +5 -2

No files found.
--- a/dlls/msvcrt/main.c
+++ b/dlls/msvcrt/main.c
@@ -70,8 +70,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  case DLL_THREAD_DETACH:
    /* Free TLS */
    tls = TlsGetValue(msvcrt_tls_index);
-    HeapFree(GetProcessHeap(),0,tls->efcvt_buffer);
-    HeapFree(GetProcessHeap(),0,tls->wasctime_buffer);
+    if (tls)
+    {
+	HeapFree(GetProcessHeap(),0,tls->efcvt_buffer);
+	HeapFree(GetProcessHeap(),0,tls->wasctime_buffer);
+    }
    HeapFree(GetProcessHeap(), 0, tls);
    TRACE("finished thread free\n");
    break;