diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-20 20:37:53 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-20 20:37:53 +0000 |
| commit | 2711ff6d77de35c18f16c98fd5f148161eb85013 (patch) | |
| tree | 99378fbcceaedf49f5e760f4622be1bfacc39d79 /main | |
| parent | d062f6c1b9b8a6bb0cfee497cccee0ac1222111d (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@213350 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index fb58ec9c2..0ead4bf92 100644 --- a/main/features.c +++ b/main/features.c @@ -2547,7 +2547,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) { |