summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2017-02-14 21:00:45 +0100
committerJulien Nabet <serval2412@yahoo.fr>2017-02-15 06:07:05 +0000
commit18be4782ad4a98041d9680f8d76a213b8fd49362 (patch)
tree00b4fbce027efa273e87b7bc4a5567797a2c3a55
parenta88c0611e7c984db241cbcd574096afd050940f8 (diff)
tdf#105386: crash with macro organizer
bt part: 0 SvTreeList::GetParent (this=0x560670dd2e40, pEntry=pEntry@entry=0x0) at /home/julien/lo/libreoffice/svtools/source/contnr/treelist.cxx:1693 1 0x00007fd90573298c in SvTreeListBox::GetParent (this=this@entry=0x560670dd0d60, pEntry=pEntry@entry=0x0) at /home/julien/lo/libreoffice/svtools/source/contnr/treelistbox.cxx:779 2 0x00007fd8dfc3b4d8 in basctl::ExtTreeListBox::NotifyAcceptDrop (this=0x560670dd0d60, pEntry=0x560670e90b20) at /home/julien/lo/libreoffice/basctl/source/basicide/moduldlg.cxx:180 Change-Id: I033440c1fcc50e2c7a0bb1eed0efa4559c514126 Reviewed-on: https://gerrit.libreoffice.org/34280 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r--basctl/source/basicide/moduldlg.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index c76e716ae4da..1d46f11b4ba4 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -177,7 +177,9 @@ bool ExtTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry )
// don't drop in the same library
SvTreeListEntry* pSelected = FirstSelected();
- if ( ( nDepth == 1 ) && ( pEntry == GetParent( pSelected ) ) )
+ if (!pSelected)
+ bValid = false;
+ else if ( ( nDepth == 1 ) && ( pEntry == GetParent( pSelected ) ) )
bValid = false;
else if ( ( nDepth == 2 ) && ( GetParent( pEntry ) == GetParent( pSelected ) ) )
bValid = false;