Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assert that we have correct user data in libcurl callbacks

Browse Source 
Don't just silently ignore invalid user data value, this is not supposed
to happen.

Also use "userdata" name for the same parameter of all callbacks
consistently.
This commit is contained in:
Vadim Zeitlin
2021-01-11 01:35:10 +01:00
parent 397940f5cf
commit 9149a3725d
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/webrequest_curl.cpp
View File

@@ -39,20 +39,18 @@
// wxWebResponseCURL
//
static size_t wxCURLWriteData(void* buffer, size_t size, size_t nmemb, void* userp)
static size_t wxCURLWriteData(void* buffer, size_t size, size_t nmemb, void* userdata)
{
if ( userp )
return static_cast<wxWebResponseCURL*>(userp)->WriteData(buffer, size * nmemb);
else
return 0;
wxCHECK_MSG( userdata, 0, "invalid curl write callback data" );
return static_cast<wxWebResponseCURL*>(userdata)->WriteData(buffer, size * nmemb);
}
static size_t wxCURLHeader(char *buffer, size_t size, size_t nitems, void *userdata)
{
if ( userdata )
return static_cast<wxWebResponseCURL*>(userdata)->AddHeaderData(buffer, size * nitems);
else
return 0;
wxCHECK_MSG( userdata, 0, "invalid curl header callback data" );
return static_cast<wxWebResponseCURL*>(userdata)->AddHeaderData(buffer, size * nitems);
}
wxWebResponseCURL::wxWebResponseCURL(wxWebRequestCURL& request) :
@@ -137,10 +135,9 @@ int wxWebResponseCURL::GetStatus() const
static size_t wxCURLRead(char *buffer, size_t size, size_t nitems, void *userdata)
{
if ( userdata )
return static_cast<wxWebRequestCURL*>(userdata)->ReadData(buffer, size * nitems);
else
return 0;
wxCHECK_MSG( userdata, 0, "invalid curl read callback data" );
return static_cast<wxWebRequestCURL*>(userdata)->ReadData(buffer, size * nitems);
}
wxWebRequestCURL::wxWebRequestCURL(wxWebSession & session,