automerge commit

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 3f576c4de515e92cabfc35c09c34ac6318dde073..701e21e35a16eef12aa3178ff4720b1e3ad58e3b 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -9342,6 +9342,11 @@ static char *function_iaxpeer(struct ast_channel *chan, char *cmd, char *data, c
        char *peername, *colname;
        char iabuf[INET_ADDRSTRLEN];
 
+       buf[0] = '\0';
+
+       if (chan->tech != &iax2_tech)
+               return buf;
+
        if (!(peername = ast_strdupa(data))) {
                ast_log(LOG_ERROR, "Memory Error!\n");
                return ret;