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

Fix #12563: Race condition setting finish flag in WinHTTP

pull/12650/head
Jonathan G Rennison 2024-05-11 10:05:31 +01:00 committed by rubidium42
parent 9f13d3ff2b
commit b2572c7ca8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,8 +121,8 @@ void NetworkHTTPRequest::WinHttpCallback(DWORD code, void *info, DWORD length)
/* Make sure we are not in a redirect loop. */ /* Make sure we are not in a redirect loop. */
if (this->depth++ > 5) { if (this->depth++ > 5) {
Debug(net, 0, "HTTP request failed: too many redirects"); Debug(net, 0, "HTTP request failed: too many redirects");
this->finished = true;
this->callback.OnFailure(); this->callback.OnFailure();
this->finished = true;
return; return;
} }
break; break;
@ -144,8 +144,8 @@ void NetworkHTTPRequest::WinHttpCallback(DWORD code, void *info, DWORD length)
if (status_code >= 400) { if (status_code >= 400) {
/* No need to be verbose about rate limiting. */ /* No need to be verbose about rate limiting. */
Debug(net, status_code == HTTP_429_TOO_MANY_REQUESTS ? 1 : 0, "HTTP request failed: status-code {}", status_code); Debug(net, status_code == HTTP_429_TOO_MANY_REQUESTS ? 1 : 0, "HTTP request failed: status-code {}", status_code);
this->finished = true;
this->callback.OnFailure(); this->callback.OnFailure();
this->finished = true;
return; return;
} }
@ -183,14 +183,14 @@ void NetworkHTTPRequest::WinHttpCallback(DWORD code, void *info, DWORD length)
case WINHTTP_CALLBACK_STATUS_SECURE_FAILURE: case WINHTTP_CALLBACK_STATUS_SECURE_FAILURE:
case WINHTTP_CALLBACK_STATUS_REQUEST_ERROR: case WINHTTP_CALLBACK_STATUS_REQUEST_ERROR:
Debug(net, 0, "HTTP request failed: {}", GetLastErrorAsString()); Debug(net, 0, "HTTP request failed: {}", GetLastErrorAsString());
this->finished = true;
this->callback.OnFailure(); this->callback.OnFailure();
this->finished = true;
break; break;
default: default:
Debug(net, 0, "HTTP request failed: unexepected callback code 0x{:x}", code); Debug(net, 0, "HTTP request failed: unexepected callback code 0x{:x}", code);
this->finished = true;
this->callback.OnFailure(); this->callback.OnFailure();
this->finished = true;
return; return;
} }
} }
@ -233,8 +233,8 @@ void NetworkHTTPRequest::Connect()
this->connection = WinHttpConnect(_winhttp_session, url_components.lpszHostName, url_components.nPort, 0); this->connection = WinHttpConnect(_winhttp_session, url_components.lpszHostName, url_components.nPort, 0);
if (this->connection == nullptr) { if (this->connection == nullptr) {
Debug(net, 0, "HTTP request failed: {}", GetLastErrorAsString()); Debug(net, 0, "HTTP request failed: {}", GetLastErrorAsString());
this->finished = true;
this->callback.OnFailure(); this->callback.OnFailure();
this->finished = true;
return; return;
} }
@ -243,8 +243,8 @@ void NetworkHTTPRequest::Connect()
WinHttpCloseHandle(this->connection); WinHttpCloseHandle(this->connection);
Debug(net, 0, "HTTP request failed: {}", GetLastErrorAsString()); Debug(net, 0, "HTTP request failed: {}", GetLastErrorAsString());
this->finished = true;
this->callback.OnFailure(); this->callback.OnFailure();
this->finished = true;
return; return;
} }
@ -267,8 +267,8 @@ bool NetworkHTTPRequest::Receive()
{ {
if (this->callback.cancelled && !this->finished) { if (this->callback.cancelled && !this->finished) {
Debug(net, 1, "HTTP request failed: cancelled by user"); Debug(net, 1, "HTTP request failed: cancelled by user");
this->finished = true;
this->callback.OnFailure(); this->callback.OnFailure();
this->finished = true;
/* Fall-through, as we are waiting for IsQueueEmpty() to happen. */ /* Fall-through, as we are waiting for IsQueueEmpty() to happen. */
} }