Attachment 80196 Details for Bug 65131 – WockyJingleFactory: ref session while calling parse()

[patch] WockyJingleFactory: ref session while calling parse()

0001-WockyJingleFactory-ref-session-while-calling-parse.patch (text/plain), 2.56 KB, created by Simon McVittie on 2013-06-03 10:08:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-06-03 10:08:32 UTC

Size: 2.56 KB

patch

obsolete

>From e54aebfa3f9c441ac658cdbb9cfe5b20297fb7de Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 3 Jun 2013 10:38:04 +0100
>Subject: [PATCH 1/2] WockyJingleFactory: ref session while calling parse()
>
>wocky_jingle_session_parse() advances the session's state
>machine. In particular, it may cause termination, which
>causes the session to be removed from the factory's
>hash table, which may cause its last ref to be released.
>
>Until recently, this would have gone unnoticed, but
>wocky_jingle_session_acknowledge_iq() now emits a signal
>from the session (to check whether it has the "is Google
>webmail" quirk), and that causes a check that it is in fact
>still a valid session object.
>
>Also correct a misleading comment spotted while debugging
>this: priv->sessions owns both key and sess.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65131
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> wocky/wocky-jingle-factory.c |   17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
>diff --git a/wocky/wocky-jingle-factory.c b/wocky/wocky-jingle-factory.c
>index f099df2..3d4237d 100644
>--- a/wocky/wocky-jingle-factory.c
>+++ b/wocky/wocky-jingle-factory.c
>@@ -405,6 +405,11 @@ jingle_cb (
> 
>   if (sess == NULL)
>     goto REQUEST_ERROR;
>+  else
>+    /* One of the possible outcomes of wocky_jingle_session_parse() is that
>+     * the Jingle session is terminated, which removes it from our
>+     * hash table, which could release its last ref. */
>+    g_object_ref (sess);
> 
>   /* now act on the message */
>   if (!wocky_jingle_session_parse (sess, action, msg, &error))
>@@ -422,6 +427,7 @@ jingle_cb (
>   /* all went well, we can acknowledge the IQ */
>   wocky_jingle_session_acknowledge_iq (sess, msg);
> 
>+  g_object_unref (sess);
>   return TRUE;
> 
> REQUEST_ERROR:
>@@ -430,8 +436,13 @@ REQUEST_ERROR:
>   wocky_porter_send_iq_gerror (porter, msg, error);
>   g_error_free (error);
> 
>-  if (sess != NULL && new_session)
>-    wocky_jingle_session_terminate (sess, WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
>+  if (sess != NULL)
>+    {
>+      if (new_session)
>+        wocky_jingle_session_terminate (sess, WOCKY_JINGLE_REASON_UNKNOWN, NULL, NULL);
>+
>+      g_object_unref (sess);
>+    }
> 
>   return TRUE;
> }
>@@ -510,7 +521,7 @@ create_session (WockyJingleFactory *fac,
>   g_signal_connect (sess, "terminated",
>     (GCallback) session_terminated_cb, fac);
> 
>-  /* Takes ownership of key */
>+  /* Takes ownership of key and sess */
>   g_hash_table_insert (priv->sessions, key, sess);
> 
>   DEBUG ("new session (%s, %s) @ %p", jid, sid_, sess);
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 65131: 79970 | 79971 | 80051 | 80052 | 80062 | 80065 | 80196 | 80197

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.