commit 7c2e6058439da9d061e5e0bbd07c8b6d4f2ffcbf
author Caolán McNamara <caolanm@redhat.com> Sun Apr 11 11:08:40 2021 +0100
committer Caolán McNamara <caolanm@redhat.com> Sun Apr 11 14:48:18 2021 +0200
tree 2130dece5082ef6cf6197efb5c6bccdc4f88739d
parent e5a4149fb909cd1c28488d2d88534b59df738339

require only as much remaining data as is necessary

Change-Id: If26562a7d5bede1dea414cbe24871b1dd75bfe23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113943
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sc/source/filter/excel/impop.cxx

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index b461642..fdc360f 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -861,7 +861,7 @@ void ImportExcel::Mulrk()
    XclAddress aXclPos;
    aIn >> aXclPos;

    for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <= aCurrXclPos.mnCol) && (aIn.GetRecLeft() > 6); ++aCurrXclPos.mnCol )
    for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <= aCurrXclPos.mnCol) && (aIn.GetRecLeft() >= 6); ++aCurrXclPos.mnCol )
    {
        sal_uInt16 nXF = aIn.ReaduInt16();
        sal_Int32 nRkNum = aIn.ReadInt32();
@@ -880,7 +880,7 @@ void ImportExcel::Mulblank()
    XclAddress aXclPos;
    aIn >> aXclPos;

    for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <= aCurrXclPos.mnCol) && (aIn.GetRecLeft() > 2); ++aCurrXclPos.mnCol )
    for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <= aCurrXclPos.mnCol) && (aIn.GetRecLeft() >= 2); ++aCurrXclPos.mnCol )
    {
        sal_uInt16 nXF = aIn.ReaduInt16();