diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-10-11 11:10:18 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-11 20:41:50 +0200 |
commit | 789b514726af74440e8d0698082a5cc240f79c48 (patch) | |
tree | fa469b3def817535729c2afb48ab130e9e92134e | |
parent | 5782dc181fe32c4b38dc8595adf7ac99bea2bce8 (diff) |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sd/qa/unit/data/ppt/pass/ofz14989-1.ppt | bin | 0 -> 60108 bytes | |||
-rw-r--r-- | tools/source/zcodec/zcodec.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt b/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt Binary files differnew file mode 100644 index 000000000000..b470ebecdb49 --- /dev/null +++ b/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt 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; |