Kaydet (Commit) eaed822c authored tarafından Matúš Kukan's avatar Matúš Kukan Kaydeden (comit) Matúš Kukan

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/21238Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMatúš Kukan <matus@libreoffice.org>
üst c5c5626d
...@@ -816,7 +816,8 @@ bool ZipPackageStream::saveChild( ...@@ -816,7 +816,8 @@ bool ZipPackageStream::saveChild(
} }
else else
{ {
bParallelDeflate = true; // tdf#89236 Encrypting in parallel does not work
bParallelDeflate = !bToBeEncrypted;
// Do not deflate small streams in a thread // Do not deflate small streams in a thread
if (xSeek.is() && xSeek->getLength() < 100000) if (xSeek.is() && xSeek->getLength() < 100000)
bParallelDeflate = false; bParallelDeflate = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment