[telepathy-mission-control-5.16] telepathy-mission-control: dispatcher_delegate_channels: initialize am

[George Kiagiadakis]

Module: telepathy-mission-control
Branch: telepathy-mission-control-5.16
Commit: f576a9e8a125c16e3a562e3bb820707c1041af5c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=f576a9e8a125c16e3a562e3bb820707c1041af5c

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Mar 20 12:53:39 2014 +0000

dispatcher_delegate_channels: initialize am

Otherwise, if we "goto error" too soon, we'll try to g_object_unref
uninitialized memory. gcc doesn't spot that because we're using
tp_clear_object, which uses an intermediate variable, and it doesn't
propagate "uninitializedness" through assignments.

---

 src/mcd-dispatcher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 2fc0828..b004b09 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2126,7 +2126,7 @@ dispatcher_delegate_channels (
     gchar *sender = NULL;
     McdConnection *conn = NULL;
     DelegateChannelsCtx *ctx = NULL;
-    McdAccountManager *am;
+    McdAccountManager *am = NULL;
     guint i;
     GList *l;