[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - package/source

[Xisco Fauli]

 package/source/zippackage/ZipPackageStream.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 31e22b4bd961ed946bf8f0f4ccb330c699292ddb
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Wed Apr 19 11:38:59 2017 +0200

    tdf#105942 Don't hang when file is protected and compressed
    
    Change-Id: I762e6e6d457ea3f5a1f1fd706268b832a71ee550
    Reviewed-on: https://gerrit.libreoffice.org/36672
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit f8fdc6417b4d023b7c75485754a0ab1b164a69d6)
    Reviewed-on: https://gerrit.libreoffice.org/37071
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 2222f7b1f166..c66fbcf4642e 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -792,7 +792,7 @@ bool ZipPackageStream::saveChild(
         uno::Reference< io::XSeekable > xSeek(xStream, uno::UNO_QUERY);
         // It's not worth to deflate jpegs to save ~1% in a slow process
         // Unfortunately, does not work for streams protected by password
-        if (xSeek.is() && msMediaType.endsWith("/jpeg") && !m_bToBeEncrypted)
+        if (xSeek.is() && msMediaType.endsWith("/jpeg") && !m_bToBeEncrypted && !m_bToBeCompressed)
         {
             ImplSetStoredData(*pTempEntry, xStream);
             xSeek->seek(0);