[Libreoffice-commits] core.git: shell/source

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Wed Jul 1 03:37:08 PDT 2015


 shell/source/win32/shlxthandler/infotips/infotips.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2279f1f0227fc232356a7f5afc60eead77914b89
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Jul 1 12:34:46 2015 +0200

    tdf#92269 fix Windows Explorer crash caused by shellextension
    
    wcscpy_s is buffer size, not string length, so size must also account
    for a terminating NULL
    
    Change-Id: Ie69692e47c142f3b733b093d0b87fa4bb03db7b4

diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 4d20b39..70d253a 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -289,7 +289,7 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws
 
         ZeroMemory(pMem, len);
 
-        wcscpy_s(pMem, msg.length(), msg.c_str());
+        wcscpy_s(pMem, msg.length()+1, msg.c_str());
 
         *ppwszTip = pMem;
         lpMalloc->Release();


More information about the Libreoffice-commits mailing list