diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-04-03 17:07:45 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-06 14:00:15 +0200 |
| commit | b35419ad26ad290a95df50862183cd9cf2cf3ee0 (patch) | |
| tree | fa4b039ae9dbb98af8d0fe20b2eb67f6cbf95942 /sw/qa/extras/layout | |
| parent | 8f256db797d22ddb571e1f396409d8aa93f4b26c (diff) | |
forcepoint#103 avoid crash on layout of specific html
return early if the prev frame was unexpectedly deleted
and another similar case to forcepoint#100 and drop a
SwBorderAttrAccess to allow the cache entry to be removed
in SwCache::DeleteObj
Change-Id: Ia83fe8911e2f6071a28d69c3089a96e3b87cc548
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132487
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132494
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/qa/extras/layout')
| -rw-r--r-- | sw/qa/extras/layout/data/forcepoint103.html | bin | 0 -> 13413 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/data/forcepoint103.html b/sw/qa/extras/layout/data/forcepoint103.html Binary files differnew file mode 100644 index 000000000000..006a6d340ef0 --- /dev/null +++ b/sw/qa/extras/layout/data/forcepoint103.html diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 2b427ad50fa9..f9a2c04e4ea0 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2548,6 +2548,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint102) } //just care it doesn't crash/assert +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint103) +{ + createSwWebDoc(DATA_DIRECTORY, "forcepoint103.html"); +} + +//just care it doesn't crash/assert CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf147485Forcepoint) { createSwDoc(DATA_DIRECTORY, "tdf147485-forcepoint.doc"); |