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

[Michael Stahl (via logerrit)]

 sw/source/core/text/porlay.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d484e8ba447de90fd77d0244a2cda1400bbe6232
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Aug 12 17:39:18 2022 +0200
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Aug 14 13:00:35 2022 +0200

    sw: fix crash in InitBookmarks() with forum-mso-en-8410.docx
    
    Error: attempt to dereference a past-the-end iterator.
    
    Probably this only crashes in the assert(iter->pNode...) as the rest of
    the function already checks that "iter == end".
    
    (regression from commit 46e04a712e97f9095ef4da7f0e52f50cf2bfbb32)
    
    Change-Id: If652a15d1cdebb21fbce028fceeaee8dce8f7f6d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138130
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 9db1949870d0..e96686f93fbd 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1009,6 +1009,10 @@ static void InitBookmarks(
                 break;
             }
         }
+        if (iter == end)
+        {
+            break; // remaining marks are hidden
+        }
     }
 }