diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-01-07 21:34:50 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-01-08 13:40:25 +0100 |
| commit | bd509c57fe66c69901ed24a46ae835f149d8dcfd (patch) | |
| tree | b655da1017e193c45865d1e979ee3b4f6b5b7206 | |
| parent | fb9888f172b7e41605a107c13420614fe53259e3 (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>
(cherry picked from commit eaed822c9cf6b3762f727f1281003dafd300df6d)
Reviewed-on: https://gerrit.libreoffice.org/21242
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit fe7d69565866b4b02cde5aebdab4cbc11d00af2b)
| -rw-r--r-- | package/source/zippackage/ZipPackageStream.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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; |