From: Anthony Minessale <anthm@freeswitch.org>
Date: Sat, 20 Aug 2016 14:10:55 +0000 (-0500)
Subject: FS-9443 #resolve [SDP in a verto.invite with missing ICE candidates can segfault]
X-Git-Tag: v1.6.10~1^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3728d99d0f4122c1c8ded59bb42e2318e217ab7;p=thirdparty%2Ffreeswitch.git

FS-9443 #resolve [SDP in a verto.invite with missing ICE candidates can segfault]
---

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 4c552b7caf..f5f6f427b1 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -7037,8 +7037,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi
 
 					if (v_engine->ice_in.cands[v_engine->ice_in.chosen[1]][1].ready) {
 
-						if (v_engine->rtcp_mux > 0 && !strcmp(v_engine->ice_in.cands[v_engine->ice_in.chosen[1]][1].con_addr, v_engine->ice_in.cands[v_engine->ice_in.chosen[0]][0].con_addr)
-							&& v_engine->ice_in.cands[v_engine->ice_in.chosen[1]][1].con_port == v_engine->ice_in.cands[v_engine->ice_in.chosen[0]][0].con_port) {
+						if (v_engine->rtcp_mux > 0 && v_engine->ice_in.cands[v_engine->ice_in.chosen[0]][0].ready &&
+							!strcmp(v_engine->ice_in.cands[v_engine->ice_in.chosen[1]][1].con_addr, 
+									v_engine->ice_in.cands[v_engine->ice_in.chosen[0]][0].con_addr) && 
+							v_engine->ice_in.cands[v_engine->ice_in.chosen[1]][1].con_port == v_engine->ice_in.cands[v_engine->ice_in.chosen[0]][0].con_port) {
 							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Skipping VIDEO RTCP ICE (Same as VIDEO RTP)\n");
 						} else {