diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-08-13 14:22:46 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-08-13 14:22:46 +0000 |
| commit | d5eda8709c8752ef64b07d476a790ec7b563d93b (patch) | |
| tree | 75bdcf90d9fdd21401e7d268fb97ea5b29dcbd41 /channels/chan_zap.c | |
| parent | 89588a043facd19911a47c57d752b025ccfb99d5 (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_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 4152f0e19..e4304a556 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -5616,16 +5616,12 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int /* Don't use ast_set_callerid() here because it will * generate a needless NewCallerID event */ #ifdef PRI_ANI - tmp->cid.cid_num = ast_strdup(i->cid_num); - tmp->cid.cid_name = ast_strdup(i->cid_name); if (!ast_strlen_zero(i->cid_ani)) tmp->cid.cid_ani = ast_strdup(i->cid_ani); else tmp->cid.cid_ani = ast_strdup(i->cid_num); #else - 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); #endif tmp->cid.cid_pres = i->callingpres; tmp->cid.cid_ton = i->cid_ton; |