# HG changeset patch # User jakub.adam@ktknet.cz # Date 1290377228 0 # Node ID 11211e6427ae6cb3e64cf38404a70927e4479d82 # Parent b52f5d573a1761d567caef61c7a042b747c05144 pidgin: Remove a timeout when destroying this object to avoid a use-after-free Patch from Jakub "haakon" Adam. Closes #12806 committer: Paul Aurich diff -r b52f5d573a17 -r 11211e6427ae ChangeLog --- 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 diff -r b52f5d573a17 -r 11211e6427ae pidgin/gtkmedia.c --- 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); }