R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in Curl util code

Browse Source 
'curl_slist' pointer should be passed in as reference, as its destroyed elsewhere.
This commit is contained in:
Kawe Mazidjatari 2023-02-09 22:56:13 +01:00
parent 1051b3a427
commit dcf6d12ae1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/tier2/curlutils.cpp
View File

@ -13,25 +13,26 @@ size_t CURLWriteStringCallback(char* contents, size_t size, size_t nmemb, void*
return size * nmemb;
}
CURL* CURLInitRequest(const string& hostname, const string& request, string& response, curl_slist* slist)
CURL* CURLInitRequest(const string& hostname, const string& request, string& response, curl_slist*& slist)
{
std::function<void(const char*)> fnError = [&](const char* errorMsg)
{
Error(eDLL_T::ENGINE, NO_ERROR, "CURL: %s\n", errorMsg);
curl_slist_free_all(slist);
return nullptr;
};
slist = curl_slist_append(slist, "Content-Type: application/json");
if (!slist)
{
fnError("Slist init failed");
return nullptr;
}
CURL* curl = curl_easy_init();
if (!curl)
{
fnError("Easy init failed");
return nullptr;
}
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
@ -45,6 +46,7 @@ CURL* CURLInitRequest(const string& hostname, const string& request, string& res
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
curl_easy_setopt(curl, CURLOPT_VERBOSE, curl_debug->GetBool());
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
if (!ssl_verify_peer->GetBool())
{
@ -54,7 +56,7 @@ CURL* CURLInitRequest(const string& hostname, const string& request, string& res
return curl;
}
CURLcode CURLSubmitRequest(CURL* curl, curl_slist* slist)
CURLcode CURLSubmitRequest(CURL* curl, curl_slist*& slist)
{
CURLcode res = curl_easy_perform(curl);
curl_slist_free_all(slist);

4
r5dev/tier2/curlutils.h
View File

@ -3,8 +3,8 @@
size_t CURLWriteStringCallback(char* contents, size_t size, size_t nmemb, void* userp);
CURL* CURLInitRequest(const string& hostname, const string& request, string& response, curl_slist* slist);
CURLcode CURLSubmitRequest(CURL* curl, curl_slist* slist);
CURL* CURLInitRequest(const string& hostname, const string& request, string& response, curl_slist*& slist);
CURLcode CURLSubmitRequest(CURL* curl, curl_slist*& slist);
CURLINFO CURLRetrieveInfo(CURL* curl);
bool CURLHandleError(CURL* curl, CURLcode res, string& outMessage);