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

[Caolán McNamara]

 oox/source/crypto/AgileEngine.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2aaea1473962c5d0f62852a627ec0e5f0307f7bc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 29 11:51:15 2017 +0000

    ofz: avoid invalid short hashValues
    
    Change-Id: Ib7cd63351f4e5ed053e55fe9c5875ad92c81d762
    Reviewed-on: https://gerrit.libreoffice.org/45490
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx
index 502b66a0a062..ef1440f5c96e 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -130,7 +130,7 @@ bool AgileEngine::generateEncryptionKey(const OUString& rPassword)
     std::vector<sal_uInt8> hash(mInfo.hashSize, 0);
     hashCalc(hash, hashInput, mInfo.hashAlgorithm);
 
-    if (std::equal (hash.begin(), hash.end(), hashValue.begin()) )
+    if (hash.size() <= hashValue.size() && std::equal(hash.begin(), hash.end(), hashValue.begin()))
     {
         std::vector<sal_uInt8>& encryptedKeyValue = mInfo.encryptedKeyValue;
         calculateBlock(constBlock3, hashFinal, encryptedKeyValue, mKey);