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

Add protection for RTCPSender::max_packet_size_.

Browse Source 
This cl protects the access to the max_packet_size_, without fixing
the underlying race; the value is simply copied to a local variable,
whose value might be stale when used.

BUG=webrtc:7189

Review-Url: https://codereview.webrtc.org/2704263003
Cr-Commit-Position: refs/heads/master@{#16754}
This commit is contained in:
nisse
2017-02-21 07:32:47 -08:00
committed by Commit bot
parent 5ef2bc1914
commit 6f142eb36e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
View File

@ -282,6 +282,7 @@ void RTCPSender::SetTMMBRStatus(bool enable) {
}
void RTCPSender::SetMaxRtpPacketSize(size_t max_packet_size) {
rtc::CritScope lock(&critical_section_rtcp_sender_);
max_packet_size_ = max_packet_size;
}
@ -749,6 +750,8 @@ int32_t RTCPSender::SendCompoundRTCP(
const uint16_t* nack_list,
uint64_t pictureID) {
PacketContainer container(transport_, event_log_);
size_t max_packet_size;
{
rtc::CritScope lock(&critical_section_rtcp_sender_);
if (method_ == RtcpMode::kOff) {
@ -821,9 +824,10 @@ int32_t RTCPSender::SendCompoundRTCP(
}
RTC_DCHECK(AllVolatileFlagsConsumed());
max_packet_size = max_packet_size_;
}
size_t bytes_sent = container.SendPackets(max_packet_size_);
size_t bytes_sent = container.SendPackets(max_packet_size);
return bytes_sent == 0 ? -1 : 0;
}
@ -1040,15 +1044,17 @@ bool RTCPSender::SendFeedbackPacket(const rtcp::TransportFeedback& packet) {
// but we can't because of an incorrect warning (C4822) in MVS 2013.
} sender(transport_, event_log_);
size_t max_packet_size;
{
rtc::CritScope lock(&critical_section_rtcp_sender_);
if (method_ == RtcpMode::kOff)
return false;
max_packet_size = max_packet_size_;
}
RTC_DCHECK_LE(max_packet_size_, IP_PACKET_SIZE);
RTC_DCHECK_LE(max_packet_size, IP_PACKET_SIZE);
uint8_t buffer[IP_PACKET_SIZE];
return packet.BuildExternalBuffer(buffer, max_packet_size_, &sender) &&
return packet.BuildExternalBuffer(buffer, max_packet_size, &sender) &&
!sender.send_failure_;
}

2
webrtc/modules/rtp_rtcp/source/rtcp_sender.h
View File

@ -238,7 +238,7 @@ class RTCPSender {
GUARDED_BY(critical_section_rtcp_sender_);
uint32_t tmmbr_send_bps_ GUARDED_BY(critical_section_rtcp_sender_);
uint32_t packet_oh_send_ GUARDED_BY(critical_section_rtcp_sender_);
size_t max_packet_size_;
size_t max_packet_size_ GUARDED_BY(critical_section_rtcp_sender_);
// APP
uint8_t app_sub_type_ GUARDED_BY(critical_section_rtcp_sender_);