From: Travis Cross <tc@traviscross.com>
Date: Sat, 25 May 2013 20:53:52 +0000 (+0000)
Subject: Don't setup ZRTP without a session and channel
X-Git-Tag: v1.2.13~320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b2dd0a8d91edd7afdf83e198c937dc22a27cdbc;p=thirdparty%2Ffreeswitch.git

Don't setup ZRTP without a session and channel

FS-5472 --resolve
---

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 2a6cbbff62..637ce18e4e 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -2000,7 +2000,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
 	}
 
 #ifdef ENABLE_ZRTP
-	if (zrtp_on && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) {
+	if (zrtp_on && session && channel && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) {
 		switch_rtp_t *master_rtp_session = NULL;
 
 		int initiator = 0;