dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: destroying a TCPConnecter that was still resolving made illegal writes

Browse Source 
Basically, we should join the resolve thread before we destruct
the object.
This commit is contained in:
Patric Stout
2021-05-08 14:45:23 +02:00
committed by Patric Stout
parent 664a8c3e85
commit 1b75a29d12
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/core/tcp_connect.cpp
View File

@@ -32,13 +32,17 @@ TCPConnecter::TCPConnecter(const std::string &connection_string, uint16 default_
_tcp_connecters.push_back(this);
if (!StartNewThread(nullptr, "ottd:resolve", &TCPConnecter::ResolveThunk, this)) {
if (!StartNewThread(&this->resolve_thread, "ottd:resolve", &TCPConnecter::ResolveThunk, this)) {
this->Resolve();
}
}
TCPConnecter::~TCPConnecter()
{
if (this->resolve_thread.joinable()) {
this->resolve_thread.join();
}
for (const auto &socket : this->sockets) {
closesocket(socket);
}
@@ -187,6 +191,7 @@ void TCPConnecter::Resolve()
this->ai = ai;
this->OnResolved(ai);
this->is_resolved = true;
}