[Pkg-privacy-commits] [pidgin-otr] 03/21: Fix use-after-free issue during SMP

[Intrigeri]

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

intrigeri pushed a commit to branch master
in repository pidgin-otr.

commit aaf551b9dd5cbba8c4abaa3d4dc7ead860efef94
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Sun Jan 3 16:53:20 2016 -0500

    Fix use-after-free issue during SMP
    
    Thanks to Stefan Sperling <otr at stsp.name> and Hanno Böck
    <hanno at hboeck.de> for the report.
    
    Fixes #88
    
    Signed-off-by: Hanno Böck <hanno at hboeck.de>
    Signed-off-by: Ian Goldberg <iang at cs.uwaterloo.ca>
---
 gtk-dialog.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gtk-dialog.c b/gtk-dialog.c
index 09ec12e..309bee6 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -169,7 +169,7 @@ static void otrg_gtk_dialog_free_smp_data(PurpleConversation *conv)
     g_hash_table_remove(conv->data, "otr-smpdata");
 }
 
-static void otrg_gtk_dialog_add_smp_data(PurpleConversation *conv)
+static SMPData* otrg_gtk_dialog_add_smp_data(PurpleConversation *conv)
 {
     SMPData *smp_data = malloc(sizeof(SMPData));
     smp_data->smp_secret_dialog = NULL;
@@ -182,6 +182,8 @@ static void otrg_gtk_dialog_add_smp_data(PurpleConversation *conv)
     smp_data->their_instance = OTRL_INSTAG_BEST;
 
     purple_conversation_set_data(conv, "otr-smpdata", smp_data);
+
+    return smp_data;
 }
 
 static GtkWidget *otr_icon(GtkWidget *image, TrustLevel level,
@@ -777,7 +779,7 @@ static GtkWidget *create_smp_dialog(const char *title, const char *primary,
      * will kill any existing SMP */
     if (smp_data->their_instance != context->their_instance) {
 	otrg_gtk_dialog_free_smp_data(conv);
-	otrg_gtk_dialog_add_smp_data(conv);
+	smp_data = otrg_gtk_dialog_add_smp_data(conv);
     }
 
     if (!(smp_data->smp_secret_dialog)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git