[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/bookmark.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a725379632dd9ebf9308b76ca76aeaebb96a8e46
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Jan 19 18:45:39 2023 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Jan 20 14:44:15 2023 +0000

    sw: crashtesting forum-mso-en-12641.docx, fix assert in FindFieldSep
    
    The fieldmark may overlap a section; at the start was considered here,
    but at the end was not and so the assertion wrongly fired.
    
    Change-Id: I118bc36c2d9c4ca7028a583278d0f193537c4cb2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145826
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 959f64dbb85d1785dbea5a4d2a41519c98769a7c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145802
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/core/crsr/bookmark.cxx b/sw/source/core/crsr/bookmark.cxx
index a33cb1c1eab0..af2dc2bad387 100644
--- a/sw/source/core/crsr/bookmark.cxx
+++ b/sw/source/core/crsr/bookmark.cxx
@@ -111,7 +111,8 @@ namespace sw::mark
             }
             else
             {
-                assert(pNode->IsNoTextNode() || pNode->IsSectionNode());
+                assert(pNode->IsNoTextNode() || pNode->IsSectionNode()
+                    || (pNode->IsEndNode() && 
pNode->StartOfSectionNode()->IsSectionNode()));
             }
         }
         assert(ret); // must have found it