luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

GDBusProxy: Fix incorrect locking

Browse Source 
Pointed out by mclasen.

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2011-05-26 10:07:38 -04:00
parent c0f4a63c89
commit 06f5de77f0
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gio/gdbusproxy.c
View File

@ -827,9 +827,15 @@ on_signal_received (GDBusConnection *connection,
G_LOCK (signal_subscription_lock);
proxy = data->proxy;
if (proxy == NULL)
goto out;
g_object_ref (proxy);
G_UNLOCK (signal_subscription_lock);
{
G_UNLOCK (signal_subscription_lock);
goto out;
}
else
{
g_object_ref (proxy);
G_UNLOCK (signal_subscription_lock);
}
if (!proxy->priv->initialized)
goto out;
@ -919,9 +925,15 @@ on_properties_changed (GDBusConnection *connection,
G_LOCK (signal_subscription_lock);
proxy = data->proxy;
if (proxy == NULL)
goto out;
g_object_ref (proxy);
G_UNLOCK (signal_subscription_lock);
{
G_UNLOCK (signal_subscription_lock);
goto out;
}
else
{
g_object_ref (proxy);
G_UNLOCK (signal_subscription_lock);
}
changed_properties = NULL;
invalidated_properties = NULL;
@ -1117,9 +1129,15 @@ on_name_owner_changed (GDBusConnection *connection,
G_LOCK (signal_subscription_lock);
proxy = data->proxy;
if (proxy == NULL)
goto out;
g_object_ref (proxy);
G_UNLOCK (signal_subscription_lock);
{
G_UNLOCK (signal_subscription_lock);
goto out;
}
else
{
g_object_ref (proxy);
G_UNLOCK (signal_subscription_lock);
}
/* if we are already trying to load properties, cancel that */
if (proxy->priv->get_all_cancellable != NULL)