luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-25 21:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/chergert/merge-private-fix' into 'glib-2-66'

Browse Source 
gthread: Destroy value after replacing it in g_private_replace()

See merge request GNOME/glib!1820
This commit is contained in:
Sebastian Dröge 2020-12-17 18:43:24 +00:00
commit 4c6daefd6b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gthread-posix.c
View File

@ -1116,11 +1116,12 @@ g_private_replace (GPrivate *key,
gint status; gint status;
old = pthread_getspecific (*impl); old = pthread_getspecific (*impl);
if (old && key->notify)
key->notify (old);
if G_UNLIKELY ((status = pthread_setspecific (*impl, value)) != 0) if G_UNLIKELY ((status = pthread_setspecific (*impl, value)) != 0)
g_thread_abort (status, "pthread_setspecific"); g_thread_abort (status, "pthread_setspecific");
if (old && key->notify)
key->notify (old);
} }
/* {{{1 GThread */ /* {{{1 GThread */

2
glib/gthread-win32.c
View File

@ -373,9 +373,9 @@ g_private_replace (GPrivate *key,
gpointer old; gpointer old;
old = TlsGetValue (impl); old = TlsGetValue (impl);
TlsSetValue (impl, value);
if (old && key->notify) if (old && key->notify)
key->notify (old); key->notify (old);
TlsSetValue (impl, value);
} }
/* {{{1 GThread */ /* {{{1 GThread */