diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-07-13 12:02:59 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-07-17 11:28:26 +0200 |
| commit | 31cb5467927dc87579e7343b270b81fc13b0ab79 (patch) | |
| tree | 8179b0a1a988f8964166a3ce51eb66548e833c3d /package | |
| parent | e04cc65a04443d0399f685f00db077a81cf91838 (diff) | |
fix encrypted parallel zip saving (tdf#134332)
ZipOutputEntryBase::processDeflated() was calling isDeflaterFinished()
to find out whether to finalize and dispose m_xCipherContext.
With ZipOutputEntryParallel this was always true, so the context
was disposed after the first call. That was originally correct, because
originally processDeflated() was called just once at the very end, but
353d4528b8ad8abca9a13f3016632e42bab7afde changed to calling it several
times.
Change-Id: I1e4a0c887e4ba7ac7b20fa315169eaa911335fde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98625
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 08161f853571e3d4113c40a5d9d2cc24dca7506f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98648
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 53c3c95c0a3d42161ea661ecb454ef46d4b7111f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98838
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/ZipOutputEntry.hxx | 1 | ||||
| -rw-r--r-- | package/source/zipapi/ZipOutputEntry.cxx | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx index b7720a5009d8..9ef4466ed742 100644 --- a/package/inc/ZipOutputEntry.hxx +++ b/package/inc/ZipOutputEntry.hxx @@ -139,6 +139,7 @@ class ZipOutputEntryParallel final : public ZipOutputEntryBase { sal_Int64 totalIn; sal_Int64 totalOut; + bool finished; public: ZipOutputEntryParallel( const css::uno::Reference< css::io::XOutputStream >& rxOutStream, diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx index c63dc1691136..c9a4943cbe19 100644 --- a/package/source/zipapi/ZipOutputEntry.cxx +++ b/package/source/zipapi/ZipOutputEntry.cxx @@ -358,6 +358,7 @@ ZipOutputEntryParallel::ZipOutputEntryParallel( : ZipOutputEntryBase(rxOutput, rxContext, rEntry, pStream, bEncrypt, true) , totalIn(0) , totalOut(0) +, finished(false) { } @@ -381,6 +382,7 @@ void ZipOutputEntryParallel::writeStream(const uno::Reference< io::XInputStream void ZipOutputEntryParallel::finishDeflater() { // ThreadedDeflater is called synchronously in one call, so nothing to do here. + finished = true; } sal_Int64 ZipOutputEntryParallel::getDeflaterTotalIn() const @@ -397,11 +399,12 @@ void ZipOutputEntryParallel::deflaterReset() { totalIn = 0; totalOut = 0; + finished = false; } bool ZipOutputEntryParallel::isDeflaterFinished() const { - return true; + return finished; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |