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

don't overrun 80 char buffer boundaries in HandleTooltipNotify()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-10-28 20:03:50 +00:00
parent 186af62077
commit 3095762276
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/window.cpp
View File

@@ -3138,16 +3138,22 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam; LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
#if !wxUSE_UNICODE
if ( code == (WXUINT) TTN_NEEDTEXTA ) if ( code == (WXUINT) TTN_NEEDTEXTA )
{ {
ttText->lpszText = (wxChar *)ttip.c_str(); // we pass just the pointer as we store the string internally anyhow
ttText->lpszText = (char *)ttip.c_str();
} }
else else // TTN_NEEDTEXTW
#endif // !Unicode
{ {
#if wxUSE_UNICODE #if wxUSE_UNICODE
// in Unicode mode this is just what we need
ttText->lpszText = (wxChar *)ttip.c_str(); ttText->lpszText = (wxChar *)ttip.c_str();
#else // !Unicode #else // !Unicode
size_t lenAnsi = ttip.length(); // in ANSI mode we have to convert the string and put it into the
// provided buffer: be careful not to overrun it
const size_t lenAnsi = ttip.length();
// some compilers (MetroWerks and Cygwin) don't like calling mbstowcs // some compilers (MetroWerks and Cygwin) don't like calling mbstowcs
// with NULL argument // with NULL argument
@@ -3162,6 +3168,13 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
wchar_t *dst = (wchar_t *)ttText->szText, wchar_t *dst = (wchar_t *)ttText->szText,
*pwz = new wchar_t[lenUnicode + 1]; *pwz = new wchar_t[lenUnicode + 1];
mbstowcs(pwz, ttip, lenAnsi + 1); mbstowcs(pwz, ttip, lenAnsi + 1);
// stay inside the buffer (-1 because it must be NUL-terminated)
if ( lenUnicode > WXSIZEOF(ttText->szText) - 1 )
{
lenUnicode = WXSIZEOF(ttText->szText) - 1;
}
memcpy(dst, pwz, lenUnicode*sizeof(wchar_t)); memcpy(dst, pwz, lenUnicode*sizeof(wchar_t));
// put the terminating wide NUL // put the terminating wide NUL