[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - basctl/source

[Julien Nabet]

 basctl/source/basicide/moduldlg.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 31d786ecd6a4e5d56ac96b33085b3ba7dcf42439
Author: Julien Nabet <serval2412 at 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 at entry=0x0) at /home/julien/lo/libreoffice/svtools/source/contnr/treelist.cxx:1693
    1  0x00007fd90573298c in SvTreeListBox::GetParent (this=this at entry=0x560670dd0d60, pEntry=pEntry at 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 at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 18be4782ad4a98041d9680f8d76a213b8fd49362)
    Reviewed-on: https://gerrit.libreoffice.org/34287
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit effeccd268305a2d3537cc89e4e35f682505afcb)
    Reviewed-on: https://gerrit.libreoffice.org/34292
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index cf4e557..5a620ea 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -184,7 +184,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;