]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix a crash by checking the proper pointer for validity before deferencing it.
authorMatthew Nicholson <mnicholson@digium.com>
Thu, 20 Aug 2009 20:33:07 +0000 (20:33 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Thu, 20 Aug 2009 20:33:07 +0000 (20:33 +0000)
(closes issue #15751)
Reported by: atis
Patches:
      ast_bridge_call_peer_cdr.patch uploaded by atis (license 242)

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

res/res_features.c

index 1813268fd042eeaa6dce7ea4d72c2d0935b52fb2..7d619c86b0c18e59b7d3b685f09ae9558c1a0433 100644 (file)
@@ -1777,7 +1777,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                   is before the bridge's start time, so I added in the 
                   tvcmp check to the if below */
 
-               if (peer_cdr && !ast_tvzero(peer_cdr->answer) && ast_tvcmp(peer->cdr->answer, bridge_cdr->start) >= 0) {
+               if (peer_cdr && !ast_tvzero(peer_cdr->answer) && ast_tvcmp(peer_cdr->answer, bridge_cdr->start) >= 0) {
                        ast_cdr_setanswer(bridge_cdr, peer_cdr->answer);
                        ast_cdr_setdisposition(bridge_cdr, peer_cdr->disposition);
                        if (chan_cdr) {