diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-20 17:33:49 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-20 17:33:49 +0000 |
| commit | c88dcf65cef36a557f1e43ec4de5fe7e5b39d6a9 (patch) | |
| tree | 9ce9a684771ec768d26fdef19d1ecd68e66cf1e1 /main/features.c | |
| parent | 821678ac5c38167e2a83c4f08e0f3c4c587b221e (diff) | |
Merged revisions 195698 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r195698 | file | 2009-05-20 14:33:02 -0300 (Wed, 20 May 2009) | 12 lines
Merged revisions 195688 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r195688 | file | 2009-05-20 14:30:25 -0300 (Wed, 20 May 2009) | 5 lines
Fix some code that wrongly assumed a pointer would always be non-NULL when dealing with CDRs after a bridge.
(closes issue #15079)
Reported by: barryf
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195702 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/main/features.c b/main/features.c index 9ad0354ba..67fa710f2 100644 --- a/main/features.c +++ b/main/features.c @@ -2289,15 +2289,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); } |