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_jingle.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_jingle.c')
| -rw-r--r-- | channels/chan_jingle.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index e45724f04..8a3321c05 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -827,9 +827,7 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt * ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten)); /* Don't use ast_set_callerid() here because it will * generate an unnecessary NewCallerID 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); if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s")) tmp->cid.cid_dnid = ast_strdup(i->exten); tmp->priority = 1; |