From: Brian West <brian@freeswitch.org>
Date: Tue, 14 Feb 2017 20:30:57 +0000 (-0600)
Subject: FS-10041: [mod_conference,mod_sofia] Invalid contact,<(null)>;isfocus, when hold... 
X-Git-Tag: v1.8.0~835
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8bd2d6f984a475c1665f785f3851ffbf2b08e3a;p=thirdparty%2Ffreeswitch.git

FS-10041: [mod_conference,mod_sofia] Invalid contact,<(null)>;isfocus, when hold call inside a conference room #resolve
---

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 52c6a8d58a..ebf12893b8 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -683,7 +683,7 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Dialplan did not acknowledge_call; sent 100 Trying");
 	}
 
-	if (switch_channel_test_flag(channel, CF_CONFERENCE) && !switch_stristr(";isfocus", tech_pvt->reply_contact)) {
+	if (switch_channel_test_flag(channel, CF_CONFERENCE) && !zstr(tech_pvt->reply_contact) && !switch_stristr(";isfocus", tech_pvt->reply_contact)) {
 		tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;isfocus", tech_pvt->reply_contact);
 	}
 
@@ -1313,7 +1313,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 		goto end;
 	}
 
-	if (switch_channel_test_flag(channel, CF_CONFERENCE) && !switch_stristr(";isfocus", tech_pvt->reply_contact)) {
+	if (switch_channel_test_flag(channel, CF_CONFERENCE) && !zstr(tech_pvt->reply_contact) && !switch_stristr(";isfocus", tech_pvt->reply_contact)) {
 		tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;isfocus", tech_pvt->reply_contact);
 	}