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

Fix locking in RTPFile class

Browse Source 
This code used to have a reader-writer lock, and call
std::queue::pop() with only a reader lock, which appears unsafe. Code
changed to use a plain webrtc::Mutex.

Bug: webrtc:12102
Change-Id: Icbea17a824c91975dfebd4d05bbd0c21e1abeadc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190700
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32511}
This commit is contained in:
Niels Möller
2020-10-28 14:05:07 +01:00
committed by Commit Bot
parent 2c00c40ff9
commit 84d360771b
3 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/audio_coding/test/RTPFile.h
View File

@ -16,7 +16,8 @@
#include <queue>
#include "api/rtp_headers.h"
#include "rtc_base/synchronization/rw_lock_wrapper.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h"
namespace webrtc {
@ -70,9 +71,9 @@ class RTPPacket {
class RTPBuffer : public RTPStream {
public:
RTPBuffer();
RTPBuffer() = default;
~RTPBuffer();
~RTPBuffer() = default;
void Write(const uint8_t payloadType,
const uint32_t timeStamp,
@ -89,8 +90,8 @@ class RTPBuffer : public RTPStream {
bool EndOfFile() const override;
private:
RWLockWrapper* _queueRWLock;
std::queue<RTPPacket*> _rtpQueue;
mutable Mutex mutex_;
std::queue<RTPPacket*> _rtpQueue RTC_GUARDED_BY(&mutex_);
};
class RTPFile : public RTPStream {