admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix possible race condition and access into an empty list.

Browse Source 
TBR=mflodman@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/939021

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3131 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2012-11-19 11:49:37 +00:00
parent 4100b0402e
commit 467dfe0e7c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/video_engine/vie_remb.cc
View File

@ -158,7 +158,8 @@ WebRtc_Word32 VieRemb::Process() {
bitrate_ = 0;
bitrate_update_time_ms_ = -1;
}
if (bitrate_update_time_ms_ == -1 || ssrcs_.empty()) {
if (bitrate_update_time_ms_ == -1 || ssrcs_.empty() ||
receive_modules_.empty()) {
list_crit_->Leave();
return 0;
}
@ -176,12 +177,19 @@ WebRtc_Word32 VieRemb::Process() {
if (last_send_bitrate_ < kRembMinimumBitrateKbps) {
last_send_bitrate_ = kRembMinimumBitrateKbps;
}
// Copy SSRCs to avoid race conditions.
int ssrcs_length = ssrcs_.size();
unsigned int* ssrcs = new unsigned int[ssrcs_length];
for (int i = 0; i < ssrcs_length; ++i) {
ssrcs[i] = ssrcs_[i];
}
list_crit_->Leave();
if (sender) {
// TODO(holmer): Change RTP module API to take a vector pointer.
sender->SetREMBData(bitrate_, ssrcs_.size(), &ssrcs_[0]);
sender->SetREMBData(bitrate_, ssrcs_length, ssrcs);
}
delete [] ssrcs;
return 0;
}