really fix the length of the string returned by wxConvertStringToOle() (#10056)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-12-21 02:57:06 +00:00
parent 1c7ae45ab5
commit 9968f7b4cd

View File

@ -86,12 +86,13 @@ WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
wxString str(bStr, len);
#else
wxString str;
if ( !::WideCharToMultiByte(CP_ACP, 0 /* no flags */,
bStr, len /* not necessary NUL-terminated */,
wxStringBuffer(str, len + 1), len + 1,
NULL, NULL /* no default char */) )
if (len)
{
str.clear();
wxStringBufferLength buf(str, len); // asserts if len == 0
buf.SetLength(WideCharToMultiByte(CP_ACP, 0 /* no flags */,
bStr, len /* not necessarily NUL-terminated */,
buf, len,
NULL, NULL /* no default char */));
}
#endif