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

Caolán McNamara caolanm at redhat.com
Fri Oct 21 15:54:49 UTC 2016


 filter/source/msfilter/mscodec.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e2fa592c770222344fccb0e39db3d500fc7690b5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 21 16:53:33 2016 +0100

    clang plugin for push_back after using sized constructor
    
    the warning is bogus for this ctor, but the clang plugin
    is still active in gerrit at the moment.
    
    Change-Id: Ia55260491988a12a48e49dc4962733261d13e2a1

diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx
index ffbbd09..732fe89 100644
--- a/filter/source/msfilter/mscodec.cxx
+++ b/filter/source/msfilter/mscodec.cxx
@@ -363,7 +363,8 @@ void MSCodec_CryptoAPI::InitKey (
     sal_uInt32 saltSize = 16;
 
     // Prepare initial data -> salt + password (in 16-bit chars)
-    std::vector<sal_uInt8> initialData(pDocId, pDocId + saltSize);
+    std::vector<sal_uInt8> initialData;
+    initialData.insert(initialData.begin(), pDocId, pDocId + saltSize);
 
     // Fill PassData into KeyData.
     for (sal_Int32 nInd = 0; nInd < 16 && pPassData[nInd]; ++nInd)


More information about the Libreoffice-commits mailing list