Skip to content

Fix double-close of _serverFd in SocketServer teardown #585

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.

Sign up for GitHub

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

Open
zardus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix double-close of _serverFd in SocketServer teardown #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion ixwebsocket/IXSocketServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ namespace ix
<< "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());

Socket::closeSocket(_serverFd);
_serverFd = -1;
return std::make_pair(false, ss.str());
}

Expand All @@ -113,6 +114,7 @@ namespace ix
<< strerror(Socket::getErrno());

Socket::closeSocket(_serverFd);
_serverFd = -1;
return std::make_pair(false, ss.str());
}

Expand All @@ -125,6 +127,7 @@ namespace ix
<< strerror(Socket::getErrno());

Socket::closeSocket(_serverFd);
_serverFd = -1;
return std::make_pair(false, ss.str());
}
}
Expand All @@ -143,6 +146,7 @@ namespace ix
<< strerror(Socket::getErrno());

Socket::closeSocket(_serverFd);
_serverFd = -1;
return std::make_pair(false, ss.str());
}

Expand All @@ -155,6 +159,7 @@ namespace ix
<< strerror(Socket::getErrno());

Socket::closeSocket(_serverFd);
_serverFd = -1;
return std::make_pair(false, ss.str());
}
}
Expand All @@ -169,6 +174,7 @@ namespace ix
<< "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());

Socket::closeSocket(_serverFd);
_serverFd = -1;
return std::make_pair(false, ss.str());
}

Expand Down Expand Up @@ -231,7 +237,16 @@ namespace ix
}

_conditionVariable.notify_one();
Socket::closeSocket(_serverFd);

// stop() runs again from ~WebSocketServer() and ~SocketServer(), so
// close the listening fd exactly once: a second close of the stale
// number would destroy whatever descriptor another thread has since
// opened with it.
if (_serverFd != -1)
{
Socket::closeSocket(_serverFd);
_serverFd = -1;
}
}

void SocketServer::setConnectionStateFactory(
Expand Down