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

Fixing race between CallbackCanceled and CancelCallback in AsyncInvoker.

Browse Source 
Pointer was already protected by a critical section in two places but
not the third. Added thread annotations to prevent this from happening
in the future.

BUG=None

Review-Url: https://codereview.webrtc.org/2726263004
Cr-Commit-Position: refs/heads/master@{#17017}
This commit is contained in:
deadbeef
2017-03-03 10:33:18 -08:00
committed by Commit bot
parent a1991c5175
commit b85a88853a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/base/asyncinvoker-inl.h
View File

@ -18,6 +18,7 @@
#include "webrtc/base/messagehandler.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/thread.h"
#include "webrtc/base/thread_annotations.h"
namespace rtc {
@ -68,13 +69,16 @@ class NotifyingAsyncClosureBase : public AsyncClosure,
CritScope cs(&crit_);
callback_ = callback;
}
bool CallbackCanceled() const { return calling_thread_ == nullptr; }
bool CallbackCanceled() const {
CritScope cs(&crit_);
return calling_thread_ == nullptr;
}
private:
Location callback_posted_from_;
Callback0<void> callback_;
CriticalSection crit_;
Thread* calling_thread_;
Callback0<void> callback_ GUARDED_BY(crit_);
Thread* calling_thread_ GUARDED_BY(crit_);
void CancelCallback();
};