summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-19 19:54:42 (GMT)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-19 19:59:24 (GMT)
commitffd41ce58db5303a93c0493e3765ae366a4f1d25 (patch)
tree00c2dd28f40b4b89434a6f62744a0c1cffbdeec0
parentf3fef7babc1003737455bb1984fcd09442ab53cc (diff)
downloadtelepathy-mission-control-ffd41ce58db5303a93c0493e3765ae366a4f1d25.tar.gz
telepathy-mission-control-ffd41ce58db5303a93c0493e3765ae366a4f1d25.tar.xz
Zero-initialize McdLoadAccountsData
Otherwise, holds_setup_lock is sometimes initially nonzero, making us think we have the setup lock when really we don't, and leading to an assertion failure when we try to release it. For some reason I could only reproduce this during distcheck... Reviewed-by: Xavier Claessens (cherry picked from commit 6a073b02dbfda060142f7d47426fec55c7caba0d)
-rw-r--r--src/mcd-account-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index a221910..59693cb 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -278,7 +278,7 @@ created_cb (McdStorage *storage,
account = mcd_account_new (am, name, priv->minotaur, plugin);
g_assert (MCD_IS_ACCOUNT (account));
- lad = g_slice_new (McdLoadAccountsData);
+ lad = g_slice_new0 (McdLoadAccountsData);
lad->account_manager = g_object_ref (am);
lad->storage_plugin = g_object_ref (plugin);
lad->account_lock = 1; /* released at the end of this function */