Maxime Bellengé : msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 26 11:46:01 CST 2005
Module: wine
Branch: refs/heads/master
Commit: def7563526f17c01d61c66f684930bda92334445
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=def7563526f17c01d61c66f684930bda92334445
Author: Maxime Bellengé <maxime.bellenge at wanadoo.fr>
Date: Mon Dec 26 12:57:06 2005 +0100
msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH.
---
dlls/msvcrt/main.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c
index a79d12f..779a293 100644
--- a/dlls/msvcrt/main.c
+++ b/dlls/msvcrt/main.c
@@ -70,8 +70,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,
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;
More information about the wine-cvs
mailing list