summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-08-09 10:34:50 +0100
committerPetr Mladek <pmladek@suse.cz>2013-03-04 17:16:39 +0100
commitc288c047c5356455cb1f44e0d1a51203f09bb9d5 (patch)
tree7d50f348ecaaefe9a8516d40c252a4e33d899c07 /editeng
parent94c46f50f3407ead9f113829c9eb47538b58ea27 (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>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editdoc.cxx2
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.
}