Merged revisions 275994 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 13 Jul 2010 16:53:44 +0000 (16:53 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 13 Jul 2010 16:53:44 +0000 (16:53 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r275994 | russell | 2010-07-13 11:51:18 -0500 (Tue, 13 Jul 2010) | 14 lines

  Access peer->cdr directly instead of through a saved off reference.

  At this point in the code, it is possible that peer_cdr may be invalid.
  Specifically, in the blind transfer code, CDRs are swapped between channels.
  So, peer_cdr is no longer == peer->cdr.

  The scenario that exposed a crash in this code was a blind transfer that hit
  the system call limit, causing the transferee channel to get destroyed after
  the transfer attempt failed.  Even if it succeeds and this code doesn't crash,
  this code was still trying to reset a CDR on a channel that was now owned by
  a different thread, which is a BadThing(tm).

  (ABE-2417)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@275995 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index 798e861..32b3112 100644 (file)
@@ -3451,7 +3451,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                        /* new channel */
                        ast_cdr_specialized_reset(new_chan_cdr, 0);
                } else {
-                       ast_cdr_specialized_reset(chan_cdr, 0); /* nothing changed, reset the chan_cdr  */
+                       ast_cdr_specialized_reset(chan->cdr, 0); /* nothing changed, reset the chan cdr  */
                }
        }