[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/qa tools/source

[Caolán McNamara (via logerrit)]

 sd/qa/unit/data/ppt/pass/ofz14989-1.ppt |binary
 tools/source/zcodec/zcodec.cxx          |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f77820ba5eab155b630b93a587de39c6d35e0052
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 11 11:10:18 2019 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Oct 14 12:22:46 2019 +0200

    ofz#14989 Z_NEED_DICT related infinite loop
    
    Change-Id: I31c0d004d717564063c36862f9eef661d18768a9
    Reviewed-on: https://gerrit.libreoffice.org/80648
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/80715
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt b/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt
new file mode 100644
index 000000000000..b470ebecdb49
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt differ
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index ae1bc812c626..c03345b6934a 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -159,7 +159,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
 
         }
         err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
-        if ( err < 0 )
+        if (err < 0 || err == Z_NEED_DICT)
         {
             mbStatus = false;
             break;