diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-10 15:38:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-10 20:16:35 +0100 |
| commit | 1191a45699ba22445388ceeb834d7b1b3e77dde3 (patch) | |
| tree | 0e72bde763916197de796406e4385b3776affa93 | |
| parent | 8ed176b2cc868c187adf7edb9fe41ae1fb30f459 (diff) | |
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 <caolanm@redhat.com>
| -rw-r--r-- | extensions/source/propctrlr/browserpage.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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 |