diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-19 12:39:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-19 15:21:38 +0100 |
| commit | b99af181a40b464218434e8cf4167cb69c4383df (patch) | |
| tree | a5c1de492f8d3514bc6827be4738c48b6815b551 /svx | |
| parent | 8ed356fb69e024218538c4818ea6ad46799b2c68 (diff) | |
ofz#6432 bad-cast
ofz#6433 head-use-after-free
ofz#6435 bad-cast
Change-Id: Ic43edbab68d96e852039c3247853074180fd5091
Reviewed-on: https://gerrit.libreoffice.org/49984
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 3 | ||||
| -rw-r--r-- | svx/source/svdraw/svdobjplusdata.cxx | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 7daf499746de..612f01ab4d1f 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -39,6 +39,7 @@ #include <editeng/editeng.hxx> #include <editeng/eeitem.hxx> #include <editeng/outlobj.hxx> +#include <o3tl/deleter.hxx> #include <math.h> #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> @@ -358,7 +359,7 @@ SdrObject::~SdrObject() } SendUserCall(SdrUserCallType::Delete, GetLastBoundRect()); - pPlusData.reset(); + o3tl::reset_preserve_ptr_during(pPlusData); pGrabBagItem.reset(); mpProperties.reset(); diff --git a/svx/source/svdraw/svdobjplusdata.cxx b/svx/source/svdraw/svdobjplusdata.cxx index c7a74a5cc4c9..ee7a801cd8e4 100644 --- a/svx/source/svdraw/svdobjplusdata.cxx +++ b/svx/source/svdraw/svdobjplusdata.cxx @@ -9,9 +9,8 @@ #include <svdobjplusdata.hxx> #include <svdobjuserdatalist.hxx> - +#include <o3tl/deleter.hxx> #include <svx/svdglue.hxx> - #include <svl/SfxBroadcaster.hxx> #include <vcl/outdev.hxx> @@ -24,10 +23,7 @@ SdrObjPlusData::SdrObjPlusData(): SdrObjPlusData::~SdrObjPlusData() { - // HACK: the SdrObject::GetBroadcaster() is called during the destructor - // in SdrEdgeObj::Notify() so delete first, then clear the pointer - delete pBroadcast.get(); - (void) pBroadcast.release(); + o3tl::reset_preserve_ptr_during(pBroadcast); pUserDataList.reset(); pGluePoints.reset(); } |