[Pkg-telepathy-commits] [telepathy-mission-control-6] 81/280: McdCreateAccountData: correctly free the user-data

Simon McVittie smcv at debian.org
Thu Mar 27 20:07:08 UTC 2014


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 07856ce5c068418b2712658d6034f8746b5236a2
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Oct 15 18:10:49 2013 +0100

    McdCreateAccountData: correctly free the user-data
    
    In theory this is a bugfix, but nothing within MC actually calls
    this function with a non-NULL GDestroyNotify anyway, and it isn't API.
    
    Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34640
---
 src/mcd-account-manager.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 029c0c2..cd10461 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -653,6 +653,9 @@ mcd_create_account_data_free (McdCreateAccountData *cad)
     if (G_UNLIKELY (cad->error))
         g_error_free (cad->error);
 
+    if (cad->destroy != NULL)
+        cad->destroy (cad->user_data);
+
     g_free (cad->cm_name);
     g_free (cad->protocol_name);
     g_free (cad->display_name);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git



More information about the Pkg-telepathy-commits mailing list