[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-6' - sc/source

[Julien Nabet (via logerrit)]

 sc/source/core/data/table6.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dd9f4ba468ca1e738f19e65e438713638d4b4ac2
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Apr 14 14:28:55 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Apr 21 12:25:21 2020 +0200

    tdf#132097: fix Find Previous with direction columns crashes in specific case
    
    See bt here:
    https://bugs.documentfoundation.org/attachment.cgi?id=159553
    
    nBlockPos vector is created with nLastCol + 1 elements,
    so if we click on a cell in a column which is after last value,
    the search will crash
    
    Change-Id: I9de688a8a80a45c3e5ddea6d2f461926e9777052
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92165
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 2670e980c7dbadbdc20ff23d57ad892951edc254)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92298
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit fed70d60f7ea4b2fb9828c485ba4945343274ea8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92302
    Reviewed-by: Eike Rathke <erack at redhat.com>
    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/table6.cxx b/sc/source/core/data/table6.cxx
index 4daeb308bfd7..02e86cf2e6f1 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -328,8 +328,8 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
     bool bSkipFiltered = !rSearchItem.IsSearchFiltered();
     bool bSearchNotes = (rSearchItem.GetCellType() == SvxSearchCellType::NOTE);
     // We need to cache sc::ColumnBlockConstPosition per each column.
-    std::vector< sc::ColumnBlockConstPosition > blockPos( nLastCol + 1 );
-    for( SCCOL i = 0; i <= nLastCol; ++i )
+    std::vector< sc::ColumnBlockConstPosition > blockPos( nLastCol + 2 );
+    for( SCCOL i = 0; i <= nLastCol+1; ++i )
         aCol[ i ].InitBlockPosition( blockPos[ i ] );
     if (!bAll && rSearchItem.GetBackward())
     {