summaryrefslogtreecommitdiff
path: root/bus/bus.c
diff options
context:
space:
mode:
authorChristian Dywan <christian.dywan@lanedo.com>2011-01-17 12:41:12 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-01-17 12:41:15 +0000
commita144bf4989c9cd32d454a9c3d7494fc8c3d800b2 (patch)
treeb4d14197198bc8047d95150a8de01b2d42ad6a01 /bus/bus.c
parenta8302efd2c4022eaa945b91c04a7f4601597bbe1 (diff)
downloaddbus-a144bf4989c9cd32d454a9c3d7494fc8c3d800b2.tar.gz
clean up credentials on OOM in process_config_first_time_only
Origin: vendor, Maemo Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33128 Bug-NB: NB#180486 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'bus/bus.c')
-rw-r--r--bus/bus.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/bus/bus.c b/bus/bus.c
index 86a73fa2..f892e262 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -372,11 +372,20 @@ process_config_first_time_only (BusContext *context,
if (!credentials)
goto oom;
if (!_dbus_string_append (&log_prefix, "[session "))
- goto oom;
+ {
+ _dbus_credentials_unref (credentials);
+ goto oom;
+ }
if (!_dbus_credentials_to_string_append (credentials, &log_prefix))
- goto oom;
+ {
+ _dbus_credentials_unref (credentials);
+ goto oom;
+ }
if (!_dbus_string_append (&log_prefix, "] "))
- goto oom;
+ {
+ _dbus_credentials_unref (credentials);
+ goto oom;
+ }
_dbus_credentials_unref (credentials);
}
if (!_dbus_string_steal_data (&log_prefix, &context->log_prefix))