external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Fix RTP decode bug

Browse source
This commit is contained in:
winlin 2020-05-07 16:12:04 +08:00
parent 6fbd41cff4
commit fe01a504b6
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
trunk/src/kernel/srs_kernel_rtp.cpp
View file

@ -65,8 +65,8 @@ srs_error_t SrsRtpHeader::decode(SrsBuffer* buf)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
if (buf->size() < kRtpHeaderFixedSize) { if (!buf->require(kRtpHeaderFixedSize)) {
return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d+ bytes", kRtpHeaderFixedSize);
} }
/* /*
@ -97,8 +97,9 @@ srs_error_t SrsRtpHeader::decode(SrsBuffer* buf)
timestamp = buf->read_4bytes(); timestamp = buf->read_4bytes();
ssrc = buf->read_4bytes(); ssrc = buf->read_4bytes();
if (!buf->require(nb_bytes())) { int ext_bytes = nb_bytes() - kRtpHeaderFixedSize;
return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d+ bytes", nb_bytes()); if (!buf->require(ext_bytes)) {
return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d+ bytes", ext_bytes);
} }
for (uint8_t i = 0; i < cc; ++i) { for (uint8_t i = 0; i < cc; ++i) {
@ -119,7 +120,7 @@ srs_error_t SrsRtpHeader::decode(SrsBuffer* buf)
} }
} }
if (padding) { if (padding && !buf->empty()) {
padding_length = *(reinterpret_cast<uint8_t*>(buf->data() + buf->size() - 1)); padding_length = *(reinterpret_cast<uint8_t*>(buf->data() + buf->size() - 1));
if (!buf->require(padding_length)) { if (!buf->require(padding_length)) {
return srs_error_new(ERROR_RTC_RTP_MUXER, "padding requires %d bytes", padding_length); return srs_error_new(ERROR_RTC_RTP_MUXER, "padding requires %d bytes", padding_length);