Mercurial > pidgin3 / changeset

--- a/ChangeLog	Sun Nov 21 19:42:37 2010 +0000
+++ b/ChangeLog	Sun Nov 21 22:07:08 2010 +0000
@@ -7,6 +7,10 @@
 	  the "Unable to validate certificate" error for omega.contacts.msn.com.
 	  (#12906)
 
+	Pidgin:
+	* Avoid a use-after-free race condition in the media code (when
+	  there's an error reported by GStreamer). (#12806, Jakub Adam)
+
 	AIM and ICQ:
 	* SSL option has been changed to a tri-state menu with choices for
 	  "Don't Use Encryption", "Use Encryption if Available", and "Require

--- a/pidgin/gtkmedia.c	Sun Nov 21 19:42:37 2010 +0000
+++ b/pidgin/gtkmedia.c	Sun Nov 21 22:07:08 2010 +0000
@@ -399,6 +399,9 @@
 		gtkmedia->priv->ui = NULL;
 	}
 
+	if (gtkmedia->priv->timeout_id != 0)
+		g_source_remove(gtkmedia->priv->timeout_id);
+
 	G_OBJECT_CLASS(parent_class)->dispose(media);
 }