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

Fix memory leak introduced in 3b047b58

Browse Source 
Also, use memcpy() instead of strcpy() since we already have the length,
and use static_cast instead of reinterpret_cast.
This commit is contained in:
Paul Cornett
2015-10-02 09:12:17 -07:00
parent 982cf92fd8
commit 3423e6533b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gtk/dataobj.cpp
View File

@@ -235,7 +235,7 @@ wxTextDataObject::GetAllFormats(wxDataFormat *formats,
bool wxFileDataObject::GetDataHere(void *buf) const bool wxFileDataObject::GetDataHere(void *buf) const
{ {
char* out = reinterpret_cast<char*>(buf); char* out = static_cast<char*>(buf);
for (size_t i = 0; i < m_filenames.GetCount(); i++) for (size_t i = 0; i < m_filenames.GetCount(); i++)
{ {
@@ -243,10 +243,11 @@ bool wxFileDataObject::GetDataHere(void *buf) const
if (uri) if (uri)
{ {
size_t const len = strlen(uri); size_t const len = strlen(uri);
strcpy(out, uri); memcpy(out, uri, len);
out += len; out += len;
*(out++) = '\r'; *(out++) = '\r';
*(out++) = '\n'; *(out++) = '\n';
g_free(uri);
} }
} }
*out = 0; *out = 0;