diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-08-09 10:34:50 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-02-06 12:57:16 +0100 |
commit | 1c59d78cde9fcb8a43d7ff75db5d6fcf5f3c1d53 (patch) | |
tree | c74c5126dac09c5b469dec309a55f696de33ebba | |
parent | ed3fd72fb1ef8d104448da2b546d29c6c0198780 (diff) |
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
(cherry picked from commit 069caf79d716ba73d3281beb13fa2af67cac24f9)
Signed-off-by: David Tardon <dtardon@redhat.com>
-rw-r--r-- | editeng/source/editeng/editdoc.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 110daf5e58d0..b062114e2421 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2693,8 +2693,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. } |