[Libreoffice-commits] core.git: 3 commits - basic/source sc/source

[Caolán McNamara]

 basic/source/sbx/sbxvar.cxx         |    5 +++++
 sc/source/filter/lotus/lotimpop.cxx |    4 ++--
 sc/source/filter/starcalc/scflt.cxx |    4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 19d0950451f909086c3732ce29812c4cda513908
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 9 14:11:07 2014 +0000

    Resolves: fdo#86843 avoid getting deleted before finishing Broadcast
    
    Change-Id: I19181f9e2fbd5f906e6e5d807b1b2483e7881cf0

diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 5e75950..52b115f 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -164,6 +164,11 @@ void SbxVariable::Broadcast( sal_uIntPtr nHintId )
                 return;
             }
         }
+
+        //fdo#86843 Add a ref during the following block to guard against
+        //getting deleted before completing this method
+        SbxVariableRef aBroadcastGuard(this);
+
         // Avoid further broadcasting
         SfxBroadcaster* pSave = pCst;
         pCst = NULL;
commit a719865c9af0c38c429a00e9185575644e430666
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 9 13:36:09 2014 +0000

    coverity#1242895 Untrusted loop bound
    
    Change-Id: I057f81785972106b10c8c5a7992b2b1ec1dc145e

diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index f133163..870a68f 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1460,8 +1460,10 @@ void Sc10Import::LoadTables()
         for (i=0; i < DataCount; i++)
         {
             rStream.ReadUInt16( DataEnd );
+            DataEnd = SanitizeCol(DataEnd);
             rStream.ReadUInt16( DataValue );
-            for (SCCOL j = static_cast<SCCOL>(DataStart); j <= static_cast<SCCOL>(DataEnd); j++) pDoc->SetColWidth(j, static_cast<SCTAB> (TabNo), DataValue);
+            for (SCCOL j = static_cast<SCCOL>(DataStart); j <= static_cast<SCCOL>(DataEnd); j++)
+                pDoc->SetColWidth(j, static_cast<SCTAB> (TabNo), DataValue);
             DataStart = DataEnd + 1;
         }
         pPrgrsBar->Progress();
commit b5fc1a479080ef3f17237bee99b5596767a2e438
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 9 13:28:07 2014 +0000

    coverity#1242793 Untrusted value as argument
    
    and
    
    coverity#1242945 Untrusted value as argument
    
    Change-Id: Ie35f7ca0967366a7854bfc26085f84ce7624559f

diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index c5017c9..6c6d2ec 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -335,7 +335,7 @@ void ImportLotus::NamedSheet( void )
     OUString aName;
     Read(aName);
 
-    SCTAB nLTab(static_cast<SCTAB>(nTmpTab));
+    SCTAB nLTab(SanitizeTab(static_cast<SCTAB>(nTmpTab)));
 
     if (pD->HasTable(nLTab))
         pD->RenameTab(nLTab, aName);
@@ -395,7 +395,7 @@ void ImportLotus::_Row( const sal_uInt16 nRecLen )
 
     sal_uInt16 nTmpRow(0);
     Read(nTmpRow);
-    SCROW nRow(static_cast<SCROW>(nTmpRow));
+    SCROW nRow(SanitizeRow(static_cast<SCROW>(nTmpRow)));
     sal_uInt16 nHeight(0);
     Read(nHeight);