diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-10-15 10:38:10 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-10-20 15:35:04 +0200 |
| commit | 4deef62dbce49572be6a146898f760a558d932d7 (patch) | |
| tree | 013489d6023654e47863cc0747d55eed6ed53359 /comphelper | |
| parent | 2138d2a7a3e0e2ed5b673d8e863f59253ef23df8 (diff) | |
comphelper: fix bad error handling in CreatePackageEncryptionData()
Not sure if rtl_digest_SHA1 can realistically return an error but avoid
out-of-bounds write in this case.
(regression from commit 9188ea83c346fdc2f668178ae7538665a1b09c02)
Change-Id: If5f134cbcd9236338d1938242a469d7c79e87f06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123649
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 62128c09237152d9e0585abe2fc88f0a13274b34)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123630
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/storagehelper.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 8308e9138514..89c284e305fb 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -430,7 +430,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( if ( nError != rtl_Digest_E_None ) { aEncryptionData.realloc( nSha1Ind ); - break; + return aEncryptionData; } aEncryptionData[nSha1Ind+nInd].Value <<= uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8*>(pBuffer), RTL_DIGEST_LENGTH_SHA1 ); |