[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - shell/source

[Christian Lohmaier]

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

New commits:
commit 70c21ef09d3f05a44fbc23245bed17e64aeca6e0
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
    (cherry picked from commit 2279f1f0227fc232356a7f5afc60eead77914b89)
    Reviewed-on: https://gerrit.libreoffice.org/16653
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 657bcf2..94d86c2 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();