diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-31 10:49:12 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2011-07-13 10:03:01 +0100 |
| commit | 408fa0ee93aa270618f239e5505220dc10bd04a4 (patch) | |
| tree | e4cc6ae8fb6e015b988afb94207567ea90c373a4 /gconf | |
| parent | dc5a082303ee05b3908665b2566bb1dffad0b543 (diff) | |
| download | gconf-408fa0ee93aa270618f239e5505220dc10bd04a4.tar.gz | |
ensure_database: don't free the reply til we've finished with its args
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=654497
Bug-NB: NB#261472
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Reviewed-by: Ross Burton <ross@burtonini.com>
Diffstat (limited to 'gconf')
| -rw-r--r-- | gconf/gconf-dbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c index 8071e94b..63655e17 100644 --- a/gconf/gconf-dbus.c +++ b/gconf/gconf-dbus.c @@ -548,20 +548,20 @@ ensure_database (GConfEngine *conf, DBUS_TYPE_STRING, &db, DBUS_TYPE_INVALID); - dbus_message_unref (reply); - if (db == NULL) { if (err) *err = gconf_error_new (GCONF_ERROR_BAD_ADDRESS, _("Server couldn't resolve the address `%s'"), conf->persistent_address); - + + dbus_message_unref (reply); return FALSE; } gconf_engine_set_database (conf, db); + dbus_message_unref (reply); return TRUE; } |