Attachment 26726 Details for Bug 22182 – Simpler version of the previous patches

[patch] Simpler version of the previous patches

22182-3.diff (text/plain), 1.39 KB, created by Simon McVittie on 2009-06-12 08:43:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2009-06-12 08:43:31 UTC

Size: 1.39 KB

patch

obsolete

>commit d82dde28d7e9b1c2e39e62aac433099779da3f04
>Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date:   2009-06-12 16:42:34 +0100
>
>    fd.o #22182: fix a potential use-after-free in the callable example CM
>    
>    In some environments (I'm not sure why my laptop isn't among them),
>    closing the stream causes the channel to remove the last ref to the
>    stream, resulting in a use-after-free and a possible segfault.
>    
>    This could be avoided by holding another ref for the duration of
>    example_callable_media_stream_close, but Sjoerd and I agreed that this
>    simpler fix (re-ordering to put the possible free last) was more
>    appropriate.
>
>diff --git a/examples/cm/callable/media-stream.c b/examples/cm/callable/media-stream.c
>index 1177064..3290029 100644
>--- a/examples/cm/callable/media-stream.c
>+++ b/examples/cm/callable/media-stream.c
>@@ -389,12 +389,14 @@ example_callable_media_stream_close (ExampleCallableMediaStream *self)
>       g_message ("Sending to server: Closing stream %u",
>           self->priv->id);
> 
>-      g_signal_emit (self, signals[SIGNAL_REMOVED], 0);
>-
>       if (self->priv->connected_event_id != 0)
>         {
>           g_source_remove (self->priv->connected_event_id);
>         }
>+
>+      /* this has to come last, because the MediaChannel may unref us in
>+       * response to the removed signal */
>+      g_signal_emit (self, signals[SIGNAL_REMOVED], 0);
>     }
> }
>

Actions: View | Splinter Review

Attachments on bug 22182: 26716 | 26718 | 26724 | 26725 | 26726

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.