summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2016-01-07 21:34:50 +0100
committerMatúš Kukan <matus@libreoffice.org>2016-01-08 06:46:18 +0000
commiteaed822c9cf6b3762f727f1281003dafd300df6d (patch)
treeacba9f9c758edf274ac4d1282ab08a411d795e6f
parentc5c5626dd564d07145bb898adf6815cb56c7199b (diff)
tdf#89236: Don't deflate encrypted document in parallel
I see "warn:legacy.osl:22439:1:package/source/zipapi/ZipFile.cxx:583: Can't detect password correctness without digest!" when opening file saved with password. Obviously css::xml::crypto::XDigestContext used in ZipOutputEntry does not work properly when encrypting files in parallel, so don't do that. Change-Id: I4b354535240a4f31a6bc6855cf7f9af527634e7e Reviewed-on: https://gerrit.libreoffice.org/21238 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matúš Kukan <matus@libreoffice.org>
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 0b4cf3f5990f..2fbcfdba19ff 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -816,7 +816,8 @@ bool ZipPackageStream::saveChild(
}
else
{
- bParallelDeflate = true;
+ // tdf#89236 Encrypting in parallel does not work
+ bParallelDeflate = !bToBeEncrypted;
// Do not deflate small streams in a thread
if (xSeek.is() && xSeek->getLength() < 100000)
bParallelDeflate = false;