[asterisk-commits] russell: branch 1.4 r43553 - in /branches/1.4: ./ channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Sep 24 08:53:35 2006
New Revision: 43553

URL: http://svn.digium.com/view/asterisk?rev=43553&view=rev
Log:
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)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/channels/chan_iax2.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_iax2.c?rev=43553&r1=43552&r2=43553&view=diff
==============================================================================
--- branches/1.4/channels/chan_iax2.c (original)
+++ branches/1.4/channels/chan_iax2.c Sun Sep 24 08:53:35 2006
@@ -9523,8 +9523,10 @@
 	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")) {