Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Preallocate and set the maximum buffer size to receive the request

Browse source
This commit is contained in:
smallmodel 2025-03-13 23:36:50 +01:00
parent 9536a8ec64
commit fecd1eb505
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

41
code/sys/sys_update_checker.cpp
View file

@ -252,6 +252,7 @@ void UpdateCheckerThread::InitClient()
} }
curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl"); curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
curl_easy_setopt(handle, CURLOPT_TIMEOUT, 15);
#else #else
Com_DPrintf("Project was compiled without libcurl, will not check for updates\n"); Com_DPrintf("Project was compiled without libcurl, will not check for updates\n");
#endif #endif
@ -317,23 +318,47 @@ bool UpdateCheckerThread::ParseVersionNumber(const char *value, int& major, int&
return true; return true;
} }
// It shouldn't be possible to receive responses that high from the API
// 4MB
static constexpr unsigned int MAX_BUFFER_SIZE = 4 * 1024 * 1024;
struct WriteCallbackData {
WriteCallbackData()
{
// Reserve a buffer of 64KB
buffer.reserve(64 * 1024);
}
const char *GetData() const { return buffer.data(); }
size_t GetSize() const { return buffer.size(); }
std::string buffer;
};
size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp) size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
{ {
std::string& responseString = *(std::string *)userp; WriteCallbackData *callbackData = (WriteCallbackData *)userp;
responseString.append(contents, size * nmemb);
return size * nmemb; size_t responseSize = size * nmemb;
if (callbackData->GetSize() + responseSize + 1 > MAX_BUFFER_SIZE) {
return CURL_WRITEFUNC_ERROR;
}
callbackData->buffer.append(contents, responseSize);
return responseSize;
} }
void UpdateCheckerThread::DoRequest() void UpdateCheckerThread::DoRequest()
{ {
#ifdef HAS_LIBCURL #ifdef HAS_LIBCURL
CURLcode result; CURLcode result;
std::string responseString; WriteCallbackData callbackData;
curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, &WriteCallback); curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, &WriteCallback);
curl_easy_setopt(handle, CURLOPT_WRITEDATA, &responseString); curl_easy_setopt(handle, CURLOPT_WRITEDATA, &callbackData);
curl_easy_setopt(handle, CURLOPT_TIMEOUT, 15); curl_easy_setopt(handle, CURLOPT_MAXFILESIZE, MAX_BUFFER_SIZE);
result = curl_easy_perform(handle); result = curl_easy_perform(handle);
if (result != CURLE_OK) { if (result != CURLE_OK) {
@ -343,7 +368,7 @@ void UpdateCheckerThread::DoRequest()
nlohmann::json data; nlohmann::json data;
try { try {
data = nlohmann::json::parse(responseString); data = nlohmann::json::parse(callbackData.GetData());
} catch (const std::exception& e) { } catch (const std::exception& e) {
return; return;
} }