basegfx/source/polygon/b2dpolygoncutandtouch.cxx | 2 +- hwpfilter/source/hwpread.cxx | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit 7e164e4dcdda66f4077872065a5d2412d5130bc3 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 22 21:30:59 2023 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jul 23 11:52:34 2023 +0200 ofz#49217 Out-of-memory just abandon in this case Change-Id: I2234f130e3c8de0b044256921f5d6941acc72e59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154769 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx index a77f380b5055..302879802a6b 100644 --- a/hwpfilter/source/hwpread.cxx +++ b/hwpfilter/source/hwpread.cxx @@ -21,6 +21,7 @@ #include <comphelper/newarray.hxx> #include <unotools/configmgr.hxx> +#include <sal/log.hxx> #include <tools/long.hxx> #include <assert.h> @@ -490,7 +491,11 @@ bool Picture::Read(HWPFile & hwpf) if (nBlock != nReadBlock) break; if (nMaxAllowedDecompression && follow.size() > nMaxAllowedDecompression) - break; + { + SAL_WARN("filter.hwp", "too much decompression, abandoning"); + follow.clear(); + return false; + } } follow_block_size = follow.size(); commit 27ad68a95b513bfed5f837b66495cc210d044321 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 22 20:59:36 2023 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jul 23 11:52:25 2023 +0200 ofz#57493 Timeout Change-Id: Id8811e65227142881fc86f6d2db231fa053fc2d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154768 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx index 92a0abce6c77..c91f0ec48f7d 100644 --- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx +++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx @@ -884,7 +884,7 @@ namespace basegfx::utils if(nCount == 1) { // remove self intersections - aRetval.append(addPointsAtCutsAndTouches(rCandidate.getB2DPolygon(0))); + aRetval.append(addPointsAtCutsAndTouches(rCandidate.getB2DPolygon(0), pPointLimit)); } else {
