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

wip-string
Patric Stout 6 months ago committed by GitHub
parent 5d2ed80c95
commit 11ba951250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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,15 +285,20 @@ 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()
{ {
if (!_new_http_requests.empty()) { {
/* We delay adding new requests, as Receive() below can cause a callback which adds a new requests. */ std::lock_guard<std::mutex> lock(_new_http_requests_mutex);
_http_requests.insert(_http_requests.end(), _new_http_requests.begin(), _new_http_requests.end()); if (!_new_http_requests.empty()) {
_new_http_requests.clear(); /* 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());
_new_http_requests.clear();
}
} }
if (_http_requests.empty()) return; if (_http_requests.empty()) return;

Loading…
Cancel
Save