[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/layout/tabfrm.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 61c2fb9a189254df4bc609ca248c922984c47565
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 24 12:37:03 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Feb 24 17:14:23 2021 +0100

    crashtesting: iterators invalidated during loop with tdf94598-3.docx
    
    Change-Id: I27fbf1ba578724bb15eadf14db19db62bbd5fc40
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111484
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 6eb3ccfd1627..e6c8c2bc1a66 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -249,8 +249,10 @@ static void lcl_InvalidateLowerObjs( SwLayoutFrame& _rLayoutFrame,
         }
         if ( pLowerFrame->GetDrawObjs() )
         {
-            for (SwAnchoredObject* pAnchoredObj : *pLowerFrame->GetDrawObjs())
+            for (size_t i = 0, nCount = pLowerFrame->GetDrawObjs()->size(); i < nCount; ++i)
             {
+                SwAnchoredObject* pAnchoredObj = (*pLowerFrame->GetDrawObjs())[i];
+
                 // invalidate position of anchored object
                 pAnchoredObj->SetTmpConsiderWrapInfluence( false );
                 pAnchoredObj->SetConsiderForTextWrap( false );