sw/source/core/tox/tox.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 5b01cf958be5b9c835b97d810d429fd3ed89237e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 2 09:43:41 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 2 12:19:56 2019 +0200
crashtesting: null deref on importing ooo50983-1.odt
since...
commit a5081700bacb90d8560959a4d65d94a2d4e8dadd
Date: Fri Sep 20 10:31:40 2019 +0200
Change-Id: I8ed0f0e558103f90849c7a712e5f150fad7829a3
Reviewed-on: https://gerrit.libreoffice.org/80010
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 7b7bb2e1071b..95e160190fe6 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -123,7 +123,7 @@ SwTOXMark::SwTOXMark(const SwTOXMark& rCopy)
, m_bAutoGenerated(rCopy.m_bAutoGenerated)
, m_bMainEntry(rCopy.m_bMainEntry)
{
- if (auto pRegister = const_cast<SwTOXMark*>(&rCopy)->GetRegisteredIn())
+ if (auto pRegister = const_cast<SwTOXMark&>(rCopy).GetRegisteredIn())
pRegister->Add(this);
// Copy AlternativString
m_aAltText = rCopy.m_aAltText;
@@ -206,7 +206,8 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy)
: m_aName(rCopy.m_aName)
, m_eType(rCopy.m_eType)
{
- const_cast<SwTOXType*>(&rCopy)->GetRegisteredIn()->Add(this);
+ if (auto pRegister = const_cast<SwTOXType&>(rCopy).GetRegisteredIn())
+ pRegister->Add(this);
}
static const char* STR_POOLCOLL_TOX_ARY[] =
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
