summaryrefslogtreecommitdiff
path: root/channels/chan_phone.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_phone.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_phone.c')
-rw-r--r--channels/chan_phone.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 6a51b6dd6..e99b74ee9 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -890,9 +890,7 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *conte
/* Don't use ast_set_callerid() here because it will
* generate a NewCallerID event before the NewChannel event */
- tmp->cid.cid_num = ast_strdup(i->cid_num);
tmp->cid.cid_ani = ast_strdup(i->cid_num);
- tmp->cid.cid_name = ast_strdup(i->cid_name);
i->owner = tmp;
ast_module_ref(ast_module_info->self);