]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Don't crash on a guest directmedia call
authorTerry Wilson <twilson@digium.com>
Fri, 22 Jun 2012 19:34:59 +0000 (19:34 +0000)
committerTerry Wilson <twilson@digium.com>
Fri, 22 Jun 2012 19:34:59 +0000 (19:34 +0000)
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

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

channels/chan_sip.c

index 827e6010029dabe19def6014f188e32b9cf0ed58..4bb9a6b6680c63f0e60be29d538d17727003b7fa 100644 (file)
@@ -30091,6 +30091,12 @@ static int apply_directmedia_ha(struct sip_pvt *p1, struct sip_pvt *p2, const ch
        ast_rtp_instance_get_remote_address(p1->rtp, &them);
        ast_rtp_instance_get_local_address(p1->rtp, &us);
 
+       /* If p2 is a guest call, there will be no peer. If there is no peer, there
+        * is no directmediaha, so go ahead and allow it */
+       if (!p2->relatedpeer) {
+               return res;
+       }
+
        if ((res = ast_apply_ha(p2->relatedpeer->directmediaha, &them)) == AST_SENSE_DENY) {
                const char *us_addr = ast_strdupa(ast_sockaddr_stringify(&us));
                const char *them_addr = ast_strdupa(ast_sockaddr_stringify(&them));