luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-11 20:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32: Check and avoid using TLS index 0

Browse Source 
Zero is a valid TLS index so it needs to be checked. It’s also the
integer used to indicate that no TLS has been allocated yet, so it can’t
be used as a TLS identifier.

Incorporates changes from Philip Withnall.

Fixes: #2058
This commit is contained in:
Yongsu Park 2020-05-13 17:29:13 +09:00 committed by Philip Withnall
parent 71edc3ffe1
commit 3364e02041
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glib/gthread-win32.c
View File

@ -319,7 +319,17 @@ g_private_get_impl (GPrivate *key)
impl = TlsAlloc (); impl = TlsAlloc ();
if (impl == TLS_OUT_OF_INDEXES) if G_UNLIKELY (impl == 0)
{
/* Ignore TLS index 0 temporarily (as 0 is the indicator that we
* haven't allocated TLS yet) and alloc again;
* See https://gitlab.gnome.org/GNOME/glib/-/issues/2058 */
DWORD impl2 = TlsAlloc ();
TlsFree (impl);
impl = impl2;
}
if (impl == TLS_OUT_OF_INDEXES || impl == 0)
g_thread_abort (0, "TlsAlloc"); g_thread_abort (0, "TlsAlloc");
if (key->notify != NULL) if (key->notify != NULL)