From: Simon McVittie <smcv@collabora.com>
Date: Fri, 17 Aug 2018 14:42:17 +0000 (+0100)
Subject: activation: Don't leak if delivering activation message is forbidden
X-Git-Tag: dbus-1.13.8~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=152b09ff5af506f2461902d3f1471a418c2f2e78;p=thirdparty%2Fdbus.git

activation: Don't leak if delivering activation message is forbidden

This is technically a denial of service because the dbus-daemon will
run out of memory eventually, but it's a very slow and noisy one,
because all the rejected messages are also very likely to have
been logged to the system log.

Detected by AddressSanitizer.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Resolves: https://gitlab.freedesktop.org/dbus/dbus/issues/234
Reviewed-by: pwithnall
---

diff --git a/bus/activation.c b/bus/activation.c
index 706707ce1..2c5d710fc 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -1299,6 +1299,7 @@ bus_activation_send_pending_auto_activation_messages (BusActivation  *activation
                                                  entry->activation_message);
                 }
 
+              dbus_error_free (&error);
               link = next;
               continue;
             }