aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-24 13:53:35 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-24 13:53:35 +0000
commit65304b2bbef80a4b221f9840ddab99f8f06153a9 (patch)
tree930f868e9fa20a4d42d95c6fe3ad45f14cc4b30e /channels
parent0664915bc034e0cd084ead18f9f1aaaf1f745515 (diff)
Merged revisions 43552 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.4@43553 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 65722a83d..c1c88331b 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -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);