diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-01 15:49:48 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-01 15:49:48 +0100 |
| commit | 29e98032d1ad86686bee0fd58c65f95d1aeba439 (patch) | |
| tree | 87b4ceb31b035cf03e08b7633289dbca92877419 /indra/llwindow/llwindowwin32.cpp | |
| parent | f92d7f282954d5f4601178603aa715ae74287957 (diff) | |
| parent | 0cbdad70611201a94b9550598e61067faa1fac6b (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index a96ad7e796..f8fde0319e 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2881,10 +2881,13 @@ void LLSplashScreenWin32::updateImpl(const std::string& mesg) if( output_str_len>1024 ) return; - WCHAR w_mesg[1024]; + WCHAR w_mesg[1025];//big enought to keep null terminatos MultiByteToWideChar (CP_UTF8, 0, mesg.c_str(), mesg.length(), w_mesg, output_str_len); + //looks like MultiByteToWideChar didn't add null terminator to converted string, see EXT-4858 + w_mesg[output_str_len] = 0; + SendDlgItemMessage(mWindow, 666, // HACK: text id WM_SETTEXT, |