zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid wrong parsing of padding length and its use in NetEq simulation.

Browse Source 
Bug: b/113648474, webrtc:9730
Change-Id: Ieff7ab8697f5c8742548897a9b452a20b0bd2e7c
Reviewed-on: https://webrtc-review.googlesource.com/98461
Commit-Queue: Minyue Li <minyue@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24703}
This commit is contained in:
Minyue Li
2018-09-12 12:52:48 +02:00
committed by Commit Bot
parent fd5fbd0b58
commit 1a80018a3c
6 changed files with 114 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/rtp_rtcp/source/rtp_utility.cc
View File

@ -197,7 +197,9 @@ bool RtpHeaderParser::Parse(
header->timestamp = RTPTimestamp;
header->ssrc = SSRC;
header->numCSRCs = CC;
header->paddingLength = P ? *(_ptrRTPDataEnd - 1) : 0;
if (!P) {
header->paddingLength = 0;
}
for (uint8_t i = 0; i < CC; ++i) {
uint32_t CSRC = ByteReader<uint32_t>::ReadBigEndian(ptr);
@ -276,6 +278,21 @@ bool RtpHeaderParser::Parse(
}
header->headerLength += XLen;
}
if (header->headerLength > static_cast<size_t>(length))
return false;
if (P) {
// Packet has padding.
if (header->headerLength != static_cast<size_t>(length)) {
// Packet is not header only. We can parse padding length now.
header->paddingLength = *(_ptrRTPDataEnd - 1);
} else {
RTC_LOG(LS_WARNING) << "Cannot parse padding length.";
// Packet is header only. We have no clue of the padding length.
return false;
}
}
if (header->headerLength + header->paddingLength >
static_cast<size_t>(length))
return false;