Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IXWebSocketTransport::setReadyState(): Run under lock #540

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ixwebsocket/IXWebSocketTransport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ namespace ix

void WebSocketTransport::setReadyState(ReadyState readyState)
{
// Lock the _setReadyStateMutex for the duration of this
// method. This ensures that only a single thread runs the
// logic below avoiding concurrent execution of the
// close callback my multiple threads at the same time.
std::lock_guard<std::mutex> lock(_setReadyStateMutex);

// No state change, return
if (_readyState == readyState) return;

Expand Down
2 changes: 2 additions & 0 deletions ixwebsocket/IXWebSocketTransport.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ namespace ix

// Hold the state of the connection (OPEN, CLOSED, etc...)
std::atomic<ReadyState> _readyState;
// Mutex to serialize setReadyState() execution.
std::mutex _setReadyStateMutex;

OnCloseCallback _onCloseCallback;
std::string _closeReason;
Expand Down