summaryrefslogtreecommitdiff
path: root/channels/chan_gtalk.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-08-13 14:22:46 +0000
committerJoshua Colp <jcolp@digium.com>2007-08-13 14:22:46 +0000
commitd5eda8709c8752ef64b07d476a790ec7b563d93b (patch)
tree75bdcf90d9fdd21401e7d268fb97ea5b29dcbd41 /channels/chan_gtalk.c
parent89588a043facd19911a47c57d752b025ccfb99d5 (diff)
Merged revisions 79174 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79174 | file | 2007-08-13 11:18:04 -0300 (Mon, 13 Aug 2007) | 4 lines (closes issue #10437) Reported by: haklin Don't set the callerid name and number a second time on a newly created channel. ast_channel_alloc itself already sets it and setting it twice would cause a memory leak. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_gtalk.c')
-rw-r--r--channels/chan_gtalk.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index cbdaa076f..b4306fefe 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -979,9 +979,7 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
cid = data;
}
cid = strsep(&cid, "@");
- tmp->cid.cid_num = ast_strdup(cid);
tmp->cid.cid_ani = ast_strdup(cid);
- tmp->cid.cid_name = ast_strdup(i->them);
if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s"))
tmp->cid.cid_dnid = ast_strdup(i->exten);
tmp->priority = 1;