filter/source/msfilter/msdffimp.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 352ab705a8b97414ac3fe95419473299811104a7
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jan 13 12:12:19 2020 +0000
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon Jan 13 19:01:39 2020 +0100
ofz#20051 if duplicate exists then m_ObjToRecMap points to deleted element
Change-Id: I854410ba1d5c0a622b5ba9c6816a24a3477e5089
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86685
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index ebe405aefb9d..29fd41a9879c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5140,8 +5140,13 @@ SvxMSDffImportRec* SvxMSDffImportData::find(const
SdrObject* pObj)
void SvxMSDffImportData::insert(std::unique_ptr<SvxMSDffImportRec> pImpRec)
{
- m_ObjToRecMap[pImpRec->pObj] = pImpRec.get();
- m_Records.insert(std::move(pImpRec));
+ auto aRet = m_Records.insert(std::move(pImpRec));
+ bool bSuccess = aRet.second;
+ if (bSuccess)
+ {
+ SvxMSDffImportRec* pRec = aRet.first->get();
+ m_ObjToRecMap[pRec->pObj] = pRec;
+ }
}
void SvxMSDffImportData::NotifyFreeObj(SdrObject* pObj)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
