maiku.vv: 5dd20dcf: Fix crash when remote client reconnects ...

maiku at soc.pidgin.im maiku at soc.pidgin.im
Thu Nov 6 22:15:39 EST 2008


-----------------------------------------------------------------
Revision: 5dd20dcf495f5a0951f99516112289a1e931b5f2
Ancestor: 67334e2d7df6785a7d2ab3085e73675cfd45b26e
Author: maiku at soc.pidgin.im
Date: 2008-11-07T03:14:10
Branch: im.pidgin.maiku.vv
URL: http://d.pidgin.im/viewmtn/revision/info/5dd20dcf495f5a0951f99516112289a1e931b5f2

Modified files:
        libpurple/protocols/jabber/jingle/rtp.c

ChangeLog: 

Fix crash when remote client reconnects and tries to restart the media session.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/rtp.c	84f049857cd4258c5e3f3b66fe0308fd6e5cd6b4
+++ libpurple/protocols/jabber/jingle/rtp.c	0bc9661a54836f1529024c821dd5de69913c1c25
@@ -565,7 +565,13 @@ jingle_rtp_handle_action_internal(Jingle
 			GList *candidates = jingle_rtp_transport_to_candidates(transport);
 			GList *codecs = jingle_rtp_parse_codecs(description);
 
-			jingle_rtp_init_media(content);
+			if (jingle_rtp_init_media(content) == FALSE) {
+				/* XXX: send error */
+				jabber_iq_send(jingle_session_to_packet(session,
+						 JINGLE_SESSION_TERMINATE));
+				g_object_unref(session);
+				break;
+			}
 
 			purple_media_set_remote_codecs(jingle_rtp_get_media(session),
 					jingle_content_get_name(content),


More information about the Commits mailing list