extensions/source/propctrlr/browserpage.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 1191a45699ba22445388ceeb834d7b1b3e77dde3 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Feb 10 15:38:42 2020 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Feb 10 20:16:35 2020 +0100 Resolves: tdf#130541 null-deref on detaching already-detached page Change-Id: Ib48ab91232b8ff624a1387ab82701938eef58ded Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88380 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index edb6b08909af..5502418bd0e2 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -32,7 +32,9 @@ namespace pcr OBrowserPage::~OBrowserPage() { - m_pParent->move(m_xContainer.get(), nullptr); + if (m_pParent) + detach(); + assert(!m_pParent); } } // namespace pcr _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits