[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column2.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 346845ddff96ff14851dda8e6eb64ab8e4778a56
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Jul 2 09:24:09 2013 -0400

    Try not to iterate beyond the end of the formula block.
    
    Or else a crash would ensue...
    
    Change-Id: Ib08163ba91e4bac023ae778c704a0c052fa48ebb

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index abe2806..4becbb7 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2258,8 +2258,9 @@ const double* ScColumn::FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW n
                 return &rArray[0];
             }
 
+            // Requested length goes beyond a single block.  Fill the array
+            // with the content of this formula block first.
             itEnd = sc::formula_block::end(*aPos.first->data);
-            std::advance(itEnd, nLenRequested);
             for (; it != itEnd; ++it)
             {
                 ScFormulaCell& rCell = **it;