diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-30 12:43:21 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-04 12:31:46 +0200 |
| commit | c6640f93273475b6d686f14820051cbfa4b1b6c2 (patch) | |
| tree | de37779f8d0d8fd680e7aa2743b30d0c63467711 /include | |
| parent | 4ce1abe8e375dfcbcbaf4454b6de20231373ab40 (diff) | |
tdf#108863 svx: fix use-after-free in SdrEditView::DeleteMarkedObj()
The sdr::ViewSelection has multiple vectors with pointers to the same
SdrObjects, and those are only cleared in
sdr::ViewSelection::SetEdgesOfMarkedNodesDirty(), so deleting SdrObjects
that are marked must be delayed until after that is called.
(cherry picked from commit a54ba50db2c341f0f0e47d77dbe64a6e588bc911)
loplugin:unusedvariablecheck
leftover from a54ba50db2c341f0f0e47d77dbe64a6e588bc911 "tdf#108863 svx: fix use-
after-free in SdrEditView::DeleteMarkedObj()"
(cherry picked from commit 77f98204ba2fbb51b0a0bb2ac94b839249eec9a4)
Change-Id: I7ab18cb2116164a71dce29bf10eca974061ab424
Reviewed-on: https://gerrit.libreoffice.org/39418
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdedtv.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index f849846f720a..51045e0b0856 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -160,7 +160,8 @@ protected: // Removes all objects of the MarkList from their ObjLists including Undo. // The entries in rMark remain. - void DeleteMarkedList(const SdrMarkList& rMark); // DeleteMarked -> DeleteMarkedList + // @return a list of objects that must be deleted after the outermost EndUndo + std::vector<SdrObject *> DeleteMarkedList(SdrMarkList const& rMark); // DeleteMarked -> DeleteMarkedList // Check possibilities of all marked objects virtual void CheckPossibilities(); |