Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix race condition when setting the request state to active

Browse Source 
Call SetState(State_Active) before signalling the worker thread, as
otherwise it would be possible for it to wake up and set its state to
something else before it was reset to "active" from the main thread.

This fixed another TSAN error.
This commit is contained in:
Vadim Zeitlin
2021-01-11 01:15:28 +01:00
parent fd1d396406
commit de93f8be5b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/webrequest_curl.cpp
View File

@@ -230,16 +230,13 @@ bool wxWebRequestCURL::StartRequest()
{ {
m_bytesSent = 0; m_bytesSent = 0;
if ( m_sessionImpl.StartRequest(*this) ) if ( !m_sessionImpl.StartRequest(*this) )
{
SetState(wxWebRequest::State_Active);
return true;
}
else
{ {
SetState(wxWebRequest::State_Failed); SetState(wxWebRequest::State_Failed);
return false; return false;
} }
return true;
} }
void wxWebRequestCURL::Cancel() void wxWebRequestCURL::Cancel()
@@ -517,6 +514,8 @@ bool wxWebSessionCURL::StartRequest(wxWebRequestCURL & request)
return false; return false;
} }
request.SetState(wxWebRequest::State_Active);
// Signal the worker thread to resume work // Signal the worker thread to resume work
wxMutexLocker lock(m_mutex); wxMutexLocker lock(m_mutex);
m_condition.Signal(); m_condition.Signal();