package/source/zippackage/ZipPackageStream.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit fe7d69565866b4b02cde5aebdab4cbc11d00af2b Author: Matúš Kukan <[email protected]> Date: Thu Jan 7 21:34:50 2016 +0100 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 <[email protected]> Reviewed-by: Matúš Kukan <[email protected]> (cherry picked from commit eaed822c9cf6b3762f727f1281003dafd300df6d) Reviewed-on: https://gerrit.libreoffice.org/21242 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 76d8efc..2ed7f57 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;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
