pidgin: f34878b4: pidgin: Remove a timeout when destroying...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: f34878b425fc3e5501d82254e87d1d9271470428
Parent:   423e9ff7f2f87c870784a7e012fb30a3d5fff289
Author:   jakub.adam at ktknet.cz
Date:     11/21/10 17:07:08
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f34878b425fc3e5501d82254e87d1d9271470428

Changelog: 

pidgin: Remove a timeout when destroying this object to avoid a use-after-free

Patch from Jakub "haakon" Adam.  Closes #12806

Changes against parent 423e9ff7f2f87c870784a7e012fb30a3d5fff289

  patched  ChangeLog
  patched  pidgin/gtkmedia.c

-------------- next part --------------
============================================================
--- ChangeLog	9d2deb535a715d4d75a27bcc65473206d4a09539
+++ ChangeLog	271805d2bd664cd2545a8894d28f813e5104d5fb
@@ -7,6 +7,10 @@ version 2.7.6 (11/21/2010):
 	  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
============================================================
--- pidgin/gtkmedia.c	79989baf8a8d3a89d38134832f96986d2453a66b
+++ pidgin/gtkmedia.c	2b0276af644a5b022d43d9964d20d8e64feac136
@@ -399,6 +399,9 @@ pidgin_media_dispose(GObject *media)
 		gtkmedia->priv->ui = NULL;
 	}
 
+	if (gtkmedia->priv->timeout_id != 0)
+		g_source_remove(gtkmedia->priv->timeout_id);
+
 	G_OBJECT_CLASS(parent_class)->dispose(media);
 }