luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-27 18:10:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

gmain: Use atomic logic to set and use dispose function

Browse Source 
It can be read/written in a racy way, so let's be safer.
This commit is contained in:
Marco Trevisan (Treviño) 2025-01-31 13:04:47 +01:00
parent a5bc497021
commit 42283ffb45
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glib/gmain.c
View File

@ -32,6 +32,7 @@
*/ */
#include "config.h" #include "config.h"
#include "glib.h"
#include "glibconfig.h" #include "glibconfig.h"
#include "glib_trace.h" #include "glib_trace.h"
@ -978,10 +979,14 @@ void
g_source_set_dispose_function (GSource *source, g_source_set_dispose_function (GSource *source,
GSourceDisposeFunc dispose) GSourceDisposeFunc dispose)
{ {
gboolean was_unset G_GNUC_UNUSED;
g_return_if_fail (source != NULL); g_return_if_fail (source != NULL);
g_return_if_fail (source->priv->dispose == NULL);
g_return_if_fail (g_atomic_int_get (&source->ref_count) > 0); g_return_if_fail (g_atomic_int_get (&source->ref_count) > 0);
source->priv->dispose = dispose;
was_unset = g_atomic_pointer_compare_and_exchange (&source->priv->dispose,
NULL, dispose);
g_return_if_fail (was_unset);
} }
/* Holds context's lock */ /* Holds context's lock */
@ -2248,11 +2253,13 @@ retry_beginning:
if (old_ref == 1) if (old_ref == 1)
{ {
/* If there's a dispose function, call this first */ /* If there's a dispose function, call this first */
if (source->priv->dispose) GSourceDisposeFunc dispose_func;
if ((dispose_func = g_atomic_pointer_get (&source->priv->dispose)))
{ {
if (context) if (context)
UNLOCK_CONTEXT (context); UNLOCK_CONTEXT (context);
source->priv->dispose (source); dispose_func (source);
if (context) if (context)
LOCK_CONTEXT (context); LOCK_CONTEXT (context);
} }