]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 43552 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Sun, 24 Sep 2006 13:53:35 +0000 (13:53 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sun, 24 Sep 2006 13:53:35 +0000 (13:53 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43552 | russell | 2006-09-24 09:50:30 -0400 (Sun, 24 Sep 2006) | 4 lines

Check to see if the channel that is activating the IAXPEER function is actually
an IAX2 channel before proceeding to process it to avoid crashing.
(issue #8017, reported by admott, fixed by myself)

........

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

channels/chan_iax2.c

index 65722a83d5a77a1b7386d8bbae2c698e1dcc19ee..c1c88331bc309e8f916d74ce4ac64971e4293b09 100644 (file)
@@ -9523,9 +9523,11 @@ static int function_iaxpeer(struct ast_channel *chan, char *cmd, char *data, cha
        struct iax2_peer *peer;
        char *peername, *colname;
 
-       if (!(peername = ast_strdupa(data)))
+       if (chan->tech != &iax2_tech)
                return -1;
 
+       peername = ast_strdupa(data);
+
        /* if our channel, return the IP address of the endpoint of current channel */
        if (!strcmp(peername,"CURRENTCHANNEL")) {
                unsigned short callno = PTR_TO_CALLNO(chan->tech_pvt);