From bd509c57fe66c69901ed24a46ae835f149d8dcfd Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 7 Jan 2016 21:34:50 +0100 Subject: tdf#89236: Don't deflate encrypted document in parallel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Matúš Kukan (cherry picked from commit eaed822c9cf6b3762f727f1281003dafd300df6d) Reviewed-on: https://gerrit.libreoffice.org/21242 Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit fe7d69565866b4b02cde5aebdab4cbc11d00af2b) --- package/source/zippackage/ZipPackageStream.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 76d8efc18d89..2ed7f571f61a 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; -- cgit v1.2.3