From 23a1d37ae71a526b44d1f70d5a975d97efc22a00 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 4 May 2016 13:34:31 -0400
Subject: [PATCH] FS-9131: improve validation of ice candidates

---
 src/switch_rtp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index a58b693d70..f30d82f5b7 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1234,9 +1234,10 @@ static void handle_ice(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice, void *d
 				ice->missed_count = 0;
 				ice->rready = 1;
 
-				for (i = 0; i <= ice->ice_params->cand_idx[ice->proto]; i++) {
+				for (i = 0; i < ice->ice_params->cand_idx[ice->proto]; i++) {
 					if (ice->ice_params->cands[i][ice->proto].con_port == port) {
-						if (!strcmp(ice->ice_params->cands[i][ice->proto].con_addr, host) && 
+						if (!strcmp(ice->ice_params->cands[i][ice->proto].con_addr, host) &&
+							ice->ice_params->cands[i][ice->proto].cand_type &&
 							!strcmp(ice->ice_params->cands[i][ice->proto].cand_type, "relay")) {
 							
 							if (elapsed < 1000) {