From b7d5b3be6e7f7ddddd3f929c2ce617170dc5766a Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Thu, 20 Aug 2009 20:37:43 +0000 Subject: [PATCH] Merged revisions 213327 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r213327 | mnicholson | 2009-08-20 15:29:32 -0500 (Thu, 20 Aug 2009) | 7 lines Fix a crash by checking the proper pointer for validity before deferencing it. (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.6.1@213349 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/features.c b/main/features.c index 5ed83b68f0..a0bb928321 100644 --- a/main/features.c +++ b/main/features.c @@ -2510,7 +2510,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) { bridge_cdr->answer = peer_cdr->answer; bridge_cdr->disposition = peer_cdr->disposition; if (chan_cdr) { -- 2.47.3