Commit 55c5f756 by Jeff Hostetler

Attempt to fix Windows TLS memory leak.

parent c332bb70
...@@ -270,13 +270,21 @@ git_global_st *git__global_state(void) ...@@ -270,13 +270,21 @@ git_global_st *git__global_state(void)
return ptr; return ptr;
} }
void git__free_thread_global_state(void)
{
void *ptr = TlsGetValue(_tls_index);
if (!ptr)
return;
git__global_state_cleanup(ptr);
git__free(ptr);
TlsSetValue(_tls_index, NULL);
}
BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved) BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved)
{ {
if (reason == DLL_THREAD_DETACH) { if (reason == DLL_THREAD_DETACH)
void *ptr = TlsGetValue(_tls_index); git__free_thread_global_state();
git__global_state_cleanup(ptr);
git__free(ptr);
}
return TRUE; return TRUE;
} }
......
...@@ -32,4 +32,6 @@ typedef void (*git_global_shutdown_fn)(void); ...@@ -32,4 +32,6 @@ typedef void (*git_global_shutdown_fn)(void);
extern void git__on_shutdown(git_global_shutdown_fn callback); extern void git__on_shutdown(git_global_shutdown_fn callback);
extern void git__free_thread_global_state(void);
#endif #endif
...@@ -20,6 +20,8 @@ static DWORD WINAPI git_win32__threadproc(LPVOID lpParameter) ...@@ -20,6 +20,8 @@ static DWORD WINAPI git_win32__threadproc(LPVOID lpParameter)
thread->result = thread->proc(thread->param); thread->result = thread->proc(thread->param);
git__free_thread_global_state();
return CLEAN_THREAD_EXIT; return CLEAN_THREAD_EXIT;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment