kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate ast_channel.cid.cid_rdnis into ast_channel.redirecting.from.number.

Browse Source 
SWP-1229
ABE-2161

* Ensure chan_local.c:local_call() will not leak cid.cid_dnid when
copying.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@256104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2010-04-03 02:12:33 +00:00
parent 5333a48b17
commit a5a0a5f867
20 changed files with 66 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/channel.c
View File

@@ -1464,9 +1464,7 @@ static void free_cid(struct ast_callerid *cid)
ast_free(cid->cid_name);
if (cid->cid_ani)
ast_free(cid->cid_ani);
if (cid->cid_rdnis)
ast_free(cid->cid_rdnis);
cid->cid_dnid = cid->cid_num = cid->cid_name = cid->cid_ani = cid->cid_rdnis = NULL;
cid->cid_dnid = cid->cid_num = cid->cid_name = cid->cid_ani = NULL;
ast_party_subaddress_free(&cid->subaddress);
ast_party_subaddress_free(&cid->dialed_subaddress);
}
@@ -6973,18 +6971,6 @@ void ast_channel_set_redirecting(struct ast_channel *chan, const struct ast_part
ast_channel_lock(chan);
ast_party_id_set(&chan->redirecting.from, &redirecting->from);
if (redirecting->from.number
&& redirecting->from.number != chan->redirecting.from.number) {
/*
* Must move string to ast_channel.cid.cid_rdnis until it goes away.
*/
if (chan->cid.cid_rdnis) {
ast_free(chan->cid.cid_rdnis);
}
chan->cid.cid_rdnis = chan->redirecting.from.number;
chan->redirecting.from.number = NULL;
}
ast_party_id_set(&chan->redirecting.to, &redirecting->to);
chan->redirecting.reason = redirecting->reason;
chan->redirecting.count = redirecting->count;