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

New commits:
commit da7833bf6f8990a8916e3d38090426cb430633a4
Author:     Michael Stahl <[email protected]>
AuthorDate: Fri Aug 12 17:39:18 2022 +0200
Commit:     Caolán McNamara <[email protected]>
CommitDate: Sun Aug 14 12:57:58 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/+/138129
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <[email protected]>

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

Reply via email to