diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-13 14:22:46 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-13 14:22:46 +0000 |
| commit | 2ca342ce99c8b0600b386276c16b86fb27d1d577 (patch) | |
| tree | 75bdcf90d9fdd21401e7d268fb97ea5b29dcbd41 /channels/chan_misdn.c | |
| parent | 7ff3213f001bf1227b9f6d99d3019ac21dbea906 (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: http://svn.digium.com/svn/asterisk/trunk@79175 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
| -rw-r--r-- | channels/chan_misdn.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index ad4d5a5a9..17c6d09c9 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -3206,16 +3206,10 @@ static struct ast_channel *misdn_new(struct chan_list *chlist, int state, char else chan_misdn_log(1, 0, "misdn_new: no exten given.\n"); - if (callerid) { - char *cid_name, *cid_num; - - ast_callerid_parse(callerid, &cid_name, &cid_num); + if (callerid) /* Don't use ast_set_callerid() here because it will * generate a needless NewCallerID event */ - tmp->cid.cid_num = ast_strdup(cid_num); tmp->cid.cid_ani = ast_strdup(cid_num); - tmp->cid.cid_name = ast_strdup(cid_name); - } if (pipe(chlist->pipe) < 0) ast_log(LOG_ERROR, "Pipe failed\n"); |