From: Terry Wilson <twilson@digium.com>
Date: Fri, 22 Jun 2012 20:05:22 +0000 (+0000)
Subject: Don't crash on a guest directmedia call
X-Git-Tag: 11.0.0-beta1~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cdc5468e7138aeefe48ed33c3d6ffdbd5eb932a;p=thirdparty%2Fasterisk.git

Don't crash on a guest directmedia call

A sip_pvt may not have relatedpeer set if a call doesn't match up
with a peer. If there is no relatedpeer, there is no direct media
ACL to apply, so just return that it is allowed.

(closes issue ASTERISK-20040)
Reported by: Terry Wilson
........

Merged revisions 369214 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 369215 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fa889d86da..540dae1d54 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -30842,17 +30842,17 @@ static int sip_allow_anyrtp_remote(struct ast_channel *chan1, struct ast_channel
 	}
 
 	sip_pvt_lock(p2);
-	if (p2->relatedpeer->directmediaha) {
+	if (p2->relatedpeer && p2->relatedpeer->directmediaha) {
 		p2_directmediaha = ast_duplicate_ha_list(p2->relatedpeer->directmediaha);
 	}
 	sip_pvt_unlock(p2);
 
 	sip_pvt_lock(p1);
-	if (p1->relatedpeer->directmediaha) {
+	if (p1->relatedpeer && p1->relatedpeer->directmediaha) {
 		p1_directmediaha = ast_duplicate_ha_list(p1->relatedpeer->directmediaha);
 	}
 
-	if (ast_test_flag(&p1->flags[0], SIP_DIRECT_MEDIA)) {
+	if (p2_directmediaha && ast_test_flag(&p1->flags[0], SIP_DIRECT_MEDIA)) {
 		if (!apply_directmedia_ha(p1, p2_directmediaha, rtptype)) {
 			res = 0;
 		}
@@ -30864,7 +30864,7 @@ static int sip_allow_anyrtp_remote(struct ast_channel *chan1, struct ast_channel
 	}
 
 	sip_pvt_lock(p2);
-	if (ast_test_flag(&p2->flags[0], SIP_DIRECT_MEDIA)) {
+	if (p1_directmediaha && ast_test_flag(&p2->flags[0], SIP_DIRECT_MEDIA)) {
 		if (!apply_directmedia_ha(p2, p1_directmediaha, rtptype)) {
 			res = 0;
 		}