aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-20 17:35:11 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-20 17:35:11 +0000
commita984f28fc97d67e43c070c1a716b7f7f5b0c9861 (patch)
tree0411534dd34cc75625df12180ed565a0b26351fd /main
parenta269725c540056e2a0672af6c173ec216127bf3f (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.2@195707 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/features.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/main/features.c b/main/features.c
index 2273d0b7c..8c4296d31 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2526,15 +2526,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);
}