[Libreoffice-commits] core.git: 2 commits - svtools/source vcl/unx

[Libreoffice Gerrit user]

 svtools/source/contnr/svimpbox.cxx |    2 +-
 vcl/unx/gtk3/gtk3gtkinst.cxx       |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5062ffbfcae932edf096ce4f360f23b0fd61d111
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jul 15 19:31:19 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jul 15 22:09:24 2018 +0200

    coverity#1437954 Dereference null return value
    
    turn DBG_ASSERT into a real assert
    
    since...
    
    commit 904c97bbdf4c76709dbcacb11292668b98a9efd8
    Date:   Mon Jul 2 17:23:59 2018 +0200
    
        move SvTreeList::*Sibling to SvTreeListEntry
    
        since they don't depend on SvTreeList at all
    
    Change-Id: Ib230ff2fc9ab1f68c6686c125dbf4213e77bea84
    Reviewed-on: https://gerrit.libreoffice.org/57457
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 4f6914431dbe..69c866324279 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -1075,7 +1075,7 @@ void SvImpLBox::DrawNet(vcl::RenderContext& rRenderContext)
             aPos1.AdjustY(nEntryHeightDIV2 );
 
             pChild = pView->FirstChild( pEntry );
-            DBG_ASSERT(pChild,"Child?");
+            assert(pChild && "Child?");
             pChild = pChild->LastSibling();
             nDistance = static_cast<sal_uInt16>(pView->GetVisiblePos(pChild) - pView->GetVisiblePos(pEntry));
             aPos2 = aPos1;
commit c7911e7d6aac471018c69942256e4c9566c2183f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jul 15 18:18:38 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jul 15 22:09:09 2018 +0200

    coverity#1437953 Unchecked dynamic_cast
    
    Change-Id: I7f9e000cb47206444c4bda0896f56d220d86f04b
    Reviewed-on: https://gerrit.libreoffice.org/57456
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 4d1c42f7f1dd..40e43df22ae0 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3133,6 +3133,7 @@ public:
     virtual void set_popover(weld::Widget* pPopover) override
     {
         GtkInstanceWidget* pPopoverWidget = dynamic_cast<GtkInstanceWidget*>(pPopover);
+        assert(pPopoverWidget);
         m_pPopover = pPopoverWidget->getWidget();
         if (m_pMenuHack)
         {