kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some code that wrongly assumed a pointer would always be non-NULL when dealing with CDRs after a bridge.

Browse Source 
(closes issue #15079)
Reported by: barryf


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@195688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-05-20 17:30:25 +00:00
parent 65494bfdf7
commit 91843c8c58
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_features.c
View File

@@ -1760,15 +1760,21 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
hears nothing but ringing while the macro does its thing. */
if (peer_cdr && !ast_tvzero(peer_cdr->answer)) {
bridge_cdr->answer = peer_cdr->answer;
chan_cdr->answer = peer_cdr->answer;
bridge_cdr->disposition = peer_cdr->disposition;
chan_cdr->disposition = peer_cdr->disposition;
if (chan_cdr) {
chan_cdr->answer = peer_cdr->answer;
chan_cdr->disposition = peer_cdr->disposition;
}
} else {
ast_cdr_answer(bridge_cdr);
ast_cdr_answer(chan_cdr); /* for the sake of cli status checks */
if (chan_cdr) {
ast_cdr_answer(chan_cdr); /* for the sake of cli status checks */
}
}
if (ast_test_flag(chan,AST_FLAG_BRIDGE_HANGUP_DONT)) {
ast_set_flag(chan_cdr, AST_CDR_FLAG_BRIDGED);
if (ast_test_flag(chan,AST_FLAG_BRIDGE_HANGUP_DONT) && (chan_cdr || peer_cdr)) {
if (chan_cdr) {
ast_set_flag(chan_cdr, AST_CDR_FLAG_BRIDGED);
}
if (peer_cdr) {
ast_set_flag(peer_cdr, AST_CDR_FLAG_BRIDGED);
}