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

gdbusconnection: Avoid tripping assertion if we fail to authenticate twice

Browse Source 
If g_bus_get_sync() fails in authentication (because e.g. the process
uid, doesn't match the expected in EXTERNAL), a secondary call to
g_bus_get_sync() would notice we aren't initialized, and try
to initialize.

The assertion here is just wrong; we now explicitly and clearly handle
both cases where we already have an error, or we already succeeded.

https://bugzilla.gnome.org/show_bug.cgi?id=635694
This commit is contained in:
Colin Walters
2011-04-13 14:03:58 -04:00
parent 4d15ba90c0
commit 68b16deb1f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gdbusconnection.c
View File

@@ -2264,15 +2264,20 @@ initable_init (GInitable *initable,
ret = FALSE; ret = FALSE;
/* First, handle the case where the connection already has an
* initialization error set.
*/
if (connection->initialization_error != NULL)
goto out;
/* Also make this a no-op if we're already initialized fine */
if (connection->is_initialized) if (connection->is_initialized)
{ {
if (connection->stream != NULL) ret = TRUE;
ret = TRUE;
else
g_assert (connection->initialization_error != NULL);
goto out; goto out;
} }
g_assert (connection->initialization_error == NULL);
g_assert (connection->initialization_error == NULL && !connection->is_initialized);
/* The user can pass multiple (but mutally exclusive) construct /* The user can pass multiple (but mutally exclusive) construct
* properties: * properties: