mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: race-condition when creating new HTTP requests from different threads (#11638)

pull/11640/head
Patric Stout 2023-12-29 12:45:23 +01:00 committed by GitHub
parent 5d2ed80c95
commit 11ba951250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@
#include "http.h" #include "http.h"
#include <mutex>
#include <winhttp.h> #include <winhttp.h>
#include "../../safeguards.h" #include "../../safeguards.h"
@ -46,6 +47,7 @@ public:
static std::vector<NetworkHTTPRequest *> _http_requests; static std::vector<NetworkHTTPRequest *> _http_requests;
static std::vector<NetworkHTTPRequest *> _new_http_requests; static std::vector<NetworkHTTPRequest *> _new_http_requests;
static std::mutex _new_http_requests_mutex;
/** /**
* Create a new HTTP request. * Create a new HTTP request.
@ -283,16 +285,21 @@ NetworkHTTPRequest::~NetworkHTTPRequest()
{ {
auto request = new NetworkHTTPRequest(std::wstring(uri.begin(), uri.end()), callback, data); auto request = new NetworkHTTPRequest(std::wstring(uri.begin(), uri.end()), callback, data);
request->Connect(); request->Connect();
std::lock_guard<std::mutex> lock(_new_http_requests_mutex);
_new_http_requests.push_back(request); _new_http_requests.push_back(request);
} }
/* static */ void NetworkHTTPSocketHandler::HTTPReceive() /* static */ void NetworkHTTPSocketHandler::HTTPReceive()
{ {
{
std::lock_guard<std::mutex> lock(_new_http_requests_mutex);
if (!_new_http_requests.empty()) { if (!_new_http_requests.empty()) {
/* We delay adding new requests, as Receive() below can cause a callback which adds a new requests. */ /* We delay adding new requests, as Receive() below can cause a callback which adds a new requests. */
_http_requests.insert(_http_requests.end(), _new_http_requests.begin(), _new_http_requests.end()); _http_requests.insert(_http_requests.end(), _new_http_requests.begin(), _new_http_requests.end());
_new_http_requests.clear(); _new_http_requests.clear();
} }
}
if (_http_requests.empty()) return; if (_http_requests.empty()) return;