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

Fix off by one errors in wxURLDataObject.

Browse Source 
wxTextDataObject::SetData() adds the terminating NUL automatically so there is
no need to add it to the length when calling it from wxURLDataObject::SetURL().

This change is necessary to fix the unit test in the upcoming fix for #11102.

See #11102.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-08-30 17:25:28 +00:00
parent 69d31e3130
commit cd67a80a9a
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/ole/dataobj.cpp
View File

@@ -1248,16 +1248,22 @@ void wxURLDataObject::SetURL(const wxString& url)
wxCharBuffer urlMB(url.mb_str()); wxCharBuffer urlMB(url.mb_str());
if ( urlMB ) if ( urlMB )
{ {
const size_t len = strlen(urlMB) + 1; // size with trailing NUL const size_t len = strlen(urlMB);
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
// wxTextDataObject takes the number of characters in the string, not
// the size of the buffer (which would be len+1)
SetData(wxDF_TEXT, len, urlMB); SetData(wxDF_TEXT, len, urlMB);
#endif #endif // !wxUSE_UNICODE
SetData(wxDataFormat(CFSTR_SHELLURL), len, urlMB);
// however CFSTR_SHELLURLDataObject doesn't append NUL automatically
// but we probably still want to have it on the clipboard (just to be
// safe), so do append it
SetData(wxDataFormat(CFSTR_SHELLURL), len + 1, urlMB);
} }
#if wxUSE_UNICODE #if wxUSE_UNICODE
// notice that SetData() takes size in bytes SetData(wxDF_UNICODETEXT, url.length()*sizeof(wxChar), url.wc_str());
SetData(wxDF_UNICODETEXT, (url.length() + 1)*sizeof(wxChar), url.wc_str());
#endif #endif
} }