[Libreoffice-commits] .: editeng/source

[Caolán McNamara]

 editeng/source/editeng/editdoc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 069caf79d716ba73d3281beb13fa2af67cac24f9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 9 10:34:50 2012 +0100

    valgrind: use after free
    
    i.e. since b35980d9b
    
    seems remove, remove, delete was old pattern, new patterns ended up
    as remove+delete, remove. Reorder to remove, remove+delete
    
    Change-Id: I54ec8d0296e751110c516516465be2ac0615f6a1

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index b4a08e5..cb13c91 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2688,8 +2688,8 @@ void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool )
                 if (*rNext.GetItem() == *rAttr.GetItem())
                 {
                     rAttr.GetEnd() = rNext.GetEnd();
-                    aAttribs.erase(aAttribs.begin()+nNext);
                     rItemPool.Remove(*rNext.GetItem());
+                    aAttribs.erase(aAttribs.begin()+nNext);
                 }
                 break;  // only 1 attr with same which can start here.
             }