diff options
| author | Marco Barisione <marco@barisione.org> | 2011-01-28 14:56:39 +0000 |
|---|---|---|
| committer | Marco Barisione <marco@barisione.org> | 2011-01-28 15:15:08 +0000 |
| commit | 52d53425d4dfb2c65ec4e640c42004318f19074f (patch) | |
| tree | cbb827c044d617dd7442776f0f0f69d960909596 /src/mcd-account-manager.c | |
| parent | 0d69567e4d0d94e6018c10f528b177195c75b958 (diff) | |
McdAccountManager: don't leak if mcd_master_get_default() returns NULL
Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=33651>
Diffstat (limited to 'src/mcd-account-manager.c')
| -rw-r--r-- | src/mcd-account-manager.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c index b3711d65..7c2ac3e0 100644 --- a/src/mcd-account-manager.c +++ b/src/mcd-account-manager.c @@ -513,6 +513,9 @@ recover_connection (McdAccountManager *account_manager, gchar *file_contents, GError *error = NULL; gboolean ret = FALSE; + master = mcd_master_get_default (); + g_return_val_if_fail (MCD_IS_MASTER (master), FALSE); + object_path = g_strdelimit (g_strdup_printf ("/%s", name), ".", '/'); if (!get_account_connection (file_contents, object_path, &bus_name, &account_name)) @@ -526,9 +529,6 @@ recover_connection (McdAccountManager *account_manager, gchar *file_contents, DEBUG ("account is %s", mcd_account_get_unique_name (account)); manager_name = mcd_account_get_manager_name (account); - master = mcd_master_get_default (); - g_return_val_if_fail (MCD_IS_MASTER (master), FALSE); - manager = _mcd_master_lookup_manager (master, manager_name); if (G_UNLIKELY (!manager)) { |