7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix minor memory leak in AsyncWebRequest

Browse source
This commit is contained in:
dankmeme01 2024-03-09 12:10:42 +01:00
parent 709a6a3b3b
commit 52ea6ea51c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
loader/src/utils/web.cpp
View file

@ -170,7 +170,7 @@ private:
bool m_sent = false; bool m_sent = false;
std::variant<std::monostate, std::ostream*, ghc::filesystem::path> m_target; std::variant<std::monostate, std::ostream*, ghc::filesystem::path> m_target;
std::vector<std::string> m_httpHeaders; std::vector<std::string> m_httpHeaders;
template <class T> template <class T>
friend class AsyncWebResult; friend class AsyncWebResult;
@ -358,8 +358,8 @@ SentAsyncWebRequest::Impl::Impl(SentAsyncWebRequest* self, AsyncWebRequest const
+[](void* ptr, double total, double now, double, double) -> int { +[](void* ptr, double total, double now, double, double) -> int {
auto data = static_cast<ProgressData*>(ptr); auto data = static_cast<ProgressData*>(ptr);
auto lock = std::unique_lock(data->self->m_statusMutex); auto lock = std::unique_lock(data->self->m_statusMutex);
data->self->m_statusCV.wait(lock, [data]() { data->self->m_statusCV.wait(lock, [data]() {
return !data->self->m_paused; return !data->self->m_paused;
}); });
if (data->self->m_cancelled) { if (data->self->m_cancelled) {
if (data->file) { if (data->file) {
@ -381,6 +381,10 @@ SentAsyncWebRequest::Impl::Impl(SentAsyncWebRequest* self, AsyncWebRequest const
); );
curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &data); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &data);
auto res = curl_easy_perform(curl); auto res = curl_easy_perform(curl);
// free the header list
curl_slist_free_all(headers);
long code = 0; long code = 0;
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
if (res != CURLE_OK) { if (res != CURLE_OK) {
@ -396,7 +400,6 @@ SentAsyncWebRequest::Impl::Impl(SentAsyncWebRequest* self, AsyncWebRequest const
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
return this->error(response_str, code); return this->error(response_str, code);
} }
curl_slist_free_all(headers);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
AWAIT_RESUME(); AWAIT_RESUME();
@ -469,8 +472,8 @@ bool SentAsyncWebRequest::Impl::finished() const {
void SentAsyncWebRequest::Impl::error(std::string const& error, int code) { void SentAsyncWebRequest::Impl::error(std::string const& error, int code) {
auto lock = std::unique_lock(m_statusMutex); auto lock = std::unique_lock(m_statusMutex);
m_statusCV.wait(lock, [this]() { m_statusCV.wait(lock, [this]() {
return !m_paused; return !m_paused;
}); });
Loader::get()->queueInMainThread([this, error, code]() { Loader::get()->queueInMainThread([this, error, code]() {
{ {