[Libreoffice-commits] core.git: 2 commits - basctl/source basic/source

[Caolán McNamara (via logerrit)]

 basctl/source/dlged/dlged.cxx    |   11 +++++------
 basic/source/runtime/methods.cxx |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 7988e38a1b627b92a69dd11eabc495ff180df34d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 12:11:04 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 19 11:14:12 2019 +0200

    cid#1448451 Use after free
    
    Change-Id: I6df7a2d117be1c8f7a3e00387006c69857a98b1c
    Reviewed-on: https://gerrit.libreoffice.org/75914
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index c318ba8739d7..33d10a9ed7df 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -635,21 +635,20 @@ void DlgEditor::CreateDefaultObject()
 
         // insert object into drawing page
         SdrPageView* pPageView = pDlgEdView->GetSdrPageView();
-        pDlgEdView->InsertObjectAtView( pDlgEdObj, *pPageView);
-
-        // start listening
-        pDlgEdObj->StartListening();
+        if (pDlgEdView->InsertObjectAtView(pDlgEdObj, *pPageView))
+        {
+            // start listening
+            pDlgEdObj->StartListening();
+        }
     }
 }
 
-
 void DlgEditor::Cut()
 {
     Copy();
     Delete();
 }
 
-
 static void implCopyStreamToByteSequence( const Reference< XInputStream >& xStream,
     Sequence< sal_Int8 >& bytes )
 {
commit 7201db417cfdb115d7dc84f844c0966a82014cbd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 11:22:46 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 19 11:14:00 2019 +0200

    cid#1448547 Unchecked return value
    
    Change-Id: If0b19a53bba10064a81a22856cd3796dcefd1f68
    Reviewed-on: https://gerrit.libreoffice.org/75903
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1119adf3d9e1..fe266fdc009c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -779,7 +779,7 @@ void SbRtl_FileLen(StarBASIC *, SbxArray & rPar, bool)
             DirectoryItem aItem;
             (void)DirectoryItem::get( getFullPath( aStr ), aItem );
             FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
-            aItem.getFileStatus( aFileStatus );
+            (void)aItem.getFileStatus( aFileStatus );
             nLen = static_cast<sal_Int32>(aFileStatus.getFileSize());
         }
         rPar.Get(0)->PutLong( static_cast<long>(nLen) );