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 789b514726af74440e8d0698082a5cc240f79c48 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Oct 11 11:10:18 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Oct 11 20:41:50 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> 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 51e304fe3a67..439e838bdc96 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -154,7 +154,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm ) mnInToRead -= nInToRead; } err = mbStatus ? inflate(pStream, Z_NO_FLUSH) : Z_ERRNO; - if ( err < 0 ) + if (err < 0 || err == Z_NEED_DICT) { mbStatus = false; break; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
