basctl/source/basicide/moduldlg.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit effeccd268305a2d3537cc89e4e35f682505afcb
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue Feb 14 21:00:45 2017 +0100
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 <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit 18be4782ad4a98041d9680f8d76a213b8fd49362)
Reviewed-on: https://gerrit.libreoffice.org/34287
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/basctl/source/basicide/moduldlg.cxx
b/basctl/source/basicide/moduldlg.cxx
index 4d4df19..6618253 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
