kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

res_rtp_asterisk: Fix crash when RTCP is not available during SSRC change

Browse Source 
In r400089, a patch was put in to correct erroneous RTCP statistic resets.
Unfortunately, ast_rtp_read can be called on an RTP instance that does not
have RTCP information. This patch prevents that crash by only resetting
the statistics if we do actually have an RTCP instance.

(issue AST-1174)

(closes issue ASTERISK-22667)
Reported by: John Bigelow
........

Merged revisions 401445 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@401446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-10-22 22:42:24 +00:00
parent 2a40f6219a
commit 0336f4b606
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/res_rtp_asterisk.c
+4 -2
View File
@@ -3664,10 +3664,12 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc
rtp->rxcount = 0;
rtp->cycles = 0;
rtp->lastrxseqno = 0;
rtp->rtcp->expected_prior = 0;
rtp->rtcp->received_prior = 0;
rtp->last_seqno = 0;
rtp->last_end_timestamp = 0;
if (rtp->rtcp) {
rtp->rtcp->expected_prior = 0;
rtp->rtcp->received_prior = 0;
}
}
rtp->rxssrc = ssrc;