edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a heap-use-after-free

Browse source
This commit is contained in:
Learath 2017-10-17 14:23:13 +02:00
parent 648452ca60
commit 7f8356e37e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/client/client.cpp
View file

@ -3639,6 +3639,12 @@ void CClient::RequestDDNetInfo()
str_append(aUrl, aEscaped, sizeof(aUrl));
}
if(m_pDDNetInfoTask)
{
m_pDDNetInfoTask->Abort();
m_pDDNetInfoTask->Destroy();
}
m_pDDNetInfoTask = Fetcher()->FetchFile(aUrl, "ddnet-info.json.tmp", IStorage::TYPE_SAVE, true, true);
}

4
src/engine/client/fetcher.cpp
View file

@ -49,7 +49,7 @@ public:
void CFetchTask::Destroy()
{
if(m_State >= IFetchTask::STATE_DONE || m_State == IFetchTask::STATE_ERROR)
if(m_Job.Status() == CJob::STATE_DONE)
{
delete this;
}
@ -87,6 +87,8 @@ IFetchTask *CFetcher::FetchFile(const char *pUrl, const char *pDest, int Storage
pTask->m_pUser = pUser;
pTask->m_pfnCompCallback = pfnCompCb;
pTask->m_pfnProgressCallback = pfnProgCb;
pTask->m_UseDDNetCA = UseDDNetCA;
pTask->m_CanTimeout = CanTimeout;
pTask->m_Abort = false;
pTask->m_Destroy = false;