From 887f53ddf602e2732bbbb684e278346161c1739a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 5 Feb 2008 07:24:59 +0000 Subject: [PATCH] length passed to WideCharToMultiByte() was off by one in the last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ole/oleutils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 7bc96f5b46..356b9df708 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -96,8 +96,8 @@ WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr) #else wxString str; if ( !::WideCharToMultiByte(CP_ACP, 0 /* no flags */, - bStr, len + 1 /* include last NUL */, - wxStringBuffer(str, len), len, + bStr, len /* not necessary NUL-terminated */, + wxStringBuffer(str, len + 1), len + 1, NULL, NULL /* no default char */) ) { str.clear();