diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-13 14:18:04 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-13 14:18:04 +0000 |
| commit | 19462d7c765442837bb8ac70295d5a037fbf8adf (patch) | |
| tree | 4c7413e4845bd4634d6a3b6d5a9f50c5c203291f /channels/chan_zap.c | |
| parent | 741c2964bea85f6a86960d9e53d674eb1a0ebabc (diff) | |
(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: http://svn.digium.com/svn/asterisk/branches/1.4@79174 f38db490-d61c-443f-a65b-d21fe96a405b
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 d6d16de6e..d20596dbd 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -5317,16 +5317,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; |