1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00

Don't crash when the HTTP request for getting the server status message fails.

Same thing as 82d9c3a57879, more or less.
This commit is contained in:
Christian Walther
2017-02-17 22:54:30 +01:00
parent 5f5dd2745f
commit b74e9f47bb

View File

@ -668,7 +668,7 @@ static void HttpRequestGet(HINTERNET hConnect)
const wchar *path = BuildTypeServerStatusPath(); const wchar *path = BuildTypeServerStatusPath();
HINTERNET hRequest = 0; HINTERNET hRequest = 0;
char data[256] = {0}; char data[256] = {0};
DWORD bytesRead; DWORD bytesRead = 0;
hRequest = WinHttpOpenRequest( hRequest = WinHttpOpenRequest(
hConnect, hConnect,
@ -693,11 +693,13 @@ static void HttpRequestGet(HINTERNET hConnect)
if(b) if(b)
{ {
DWORD err = GetLastError(); DWORD err = GetLastError();
WinHttpReceiveResponse(hRequest, 0); if (WinHttpReceiveResponse(hRequest, 0)
WinHttpReadData(hRequest, data, arrsize(data)-1, &bytesRead); && WinHttpReadData(hRequest, data, arrsize(data) - 1, &bytesRead))
{
data[bytesRead] = 0; data[bytesRead] = 0;
} }
} }
}
if(bytesRead) if(bytesRead)
SetStatusText(data); SetStatusText(data);
WinHttpCloseHandle(hRequest); WinHttpCloseHandle(hRequest);