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

[Caolán McNamara (via logerrit)]

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

New commits:
commit ac854a4ccfcdcd75e93fbf629b6191821099b0a3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Apr 21 17:18:51 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Apr 22 14:36:46 2019 +0200

    crashtesting: failure on export of ooo40197-1.sxc to xlsx
    
    Change-Id: I8e3122045fbf22d4ec0b6960d6268bb5f429f600
    Reviewed-on: https://gerrit.libreoffice.org/71042
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index ec81363846f2..be38db769be4 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1122,7 +1122,8 @@ bool ScQueryCellIterator::GetThis()
         {
             do
             {
-                if ( ++nCol > mpParam->nCol2 )
+                ++nCol;
+                if (nCol > mpParam->nCol2 || nCol >= pDoc->maTabs[nTab]->GetAllocatedColumnsCount())
                     return false; // Over and out
                 if ( bAdvanceQuery )
                 {