mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
Cleanup HTTP request cleanup
Ensure with assertion that file is closed when `CHttpRequest` is destructed. Remove unnecessary assignments in destructor.
This commit is contained in:
parent
c09f1e133f
commit
6c6f058a8c
|
@ -72,21 +72,10 @@ CHttpRequest::CHttpRequest(const char *pUrl)
|
||||||
|
|
||||||
CHttpRequest::~CHttpRequest()
|
CHttpRequest::~CHttpRequest()
|
||||||
{
|
{
|
||||||
m_ResponseLength = 0;
|
dbg_assert(m_File == nullptr, "HTTP request file was not closed");
|
||||||
if(!m_WriteToFile)
|
free(m_pBuffer);
|
||||||
{
|
|
||||||
m_BufferSize = 0;
|
|
||||||
free(m_pBuffer);
|
|
||||||
m_pBuffer = nullptr;
|
|
||||||
}
|
|
||||||
curl_slist_free_all((curl_slist *)m_pHeaders);
|
curl_slist_free_all((curl_slist *)m_pHeaders);
|
||||||
m_pHeaders = nullptr;
|
free(m_pBody);
|
||||||
if(m_pBody)
|
|
||||||
{
|
|
||||||
m_BodyLength = 0;
|
|
||||||
free(m_pBody);
|
|
||||||
m_pBody = nullptr;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CHttpRequest::BeforeInit()
|
bool CHttpRequest::BeforeInit()
|
||||||
|
@ -317,6 +306,7 @@ void CHttpRequest::OnCompletionInternal(std::optional<unsigned int> Result)
|
||||||
dbg_msg("http", "i/o error, cannot close file: %s", m_aDest);
|
dbg_msg("http", "i/o error, cannot close file: %s", m_aDest);
|
||||||
State = EHttpState::ERROR;
|
State = EHttpState::ERROR;
|
||||||
}
|
}
|
||||||
|
m_File = nullptr;
|
||||||
|
|
||||||
if(State == EHttpState::ERROR || State == EHttpState::ABORTED)
|
if(State == EHttpState::ERROR || State == EHttpState::ABORTED)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue