strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves: tdf#142758 Revert record parse misunderstanding

Browse source 
of 'Related: cid#1474351 Untrusted loop bound'

and add in documentation for the records

This reverts commit 2134d83b8d.
This reverts commit 7c2e605843.
This reverts commit 3748fe3e4f.

Change-Id: I5b407eb4388a8d67fc863cc6070fbbf8b15321d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117044
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-06-11 10:43:24 +01:00
parent 4fbc246c70
commit b1d19950d3
1 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
sc/source/filter/excel/impop.cxx
View file

@ -858,16 +858,28 @@ void ImportExcel::Shrfmla()
void ImportExcel::Mulrk()
{
/* rw (2 bytes): An Rw structure that specifies the row containing the
cells with numeric data.
colFirst (2 bytes): A Col structure that specifies the first column in
the series of numeric cells within the sheet. The value of colFirst.col
MUST be less than or equal to 254.
rgrkrec (variable): An array of RkRec structures. Each element in the
array specifies an RkRec in the row. The number of entries in the array
MUST be equal to the value given by the following formula:
Number of entries in rgrkrec = (colLast.col – colFirst.col +1)
colLast (2 bytes): A Col structure that specifies the last column in
the set of numeric cells within the sheet. This colLast.col value MUST
be greater than the colFirst.col value. */
XclAddress aXclPos;
aIn >> aXclPos;
XclAddress aCurrXclPos(aXclPos);
while (true)
for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <= aCurrXclPos.mnCol) && (aIn.GetRecLeft() > 2); ++aCurrXclPos.mnCol )
{
if (aIn.GetRecLeft() < 6)
break;
if (aCurrXclPos.mnCol < aXclPos.mnCol)
break;
sal_uInt16 nXF = aIn.ReaduInt16();
sal_Int32 nRkNum = aIn.ReadInt32();
@ -877,28 +889,39 @@ void ImportExcel::Mulrk()
GetXFRangeBuffer().SetXF( aScPos, nXF );
GetDocImport().setNumericCell(aScPos, XclTools::GetDoubleFromRK(nRkNum));
}
++aCurrXclPos.mnCol;
}
}
void ImportExcel::Mulblank()
{
/* rw (2 bytes): An Rw structure that specifies a row containing the blank
cells.
colFirst (2 bytes): A Col structure that specifies the first column in
the series of blank cells within the sheet. The value of colFirst.col
MUST be less than or equal to 254.
rgixfe (variable): An array of IXFCell structures. Each element of this
array contains an IXFCell structure corresponding to a blank cell in the
series. The number of entries in the array MUST be equal to the value
given by the following formula:
Number of entries in rgixfe = (colLast.col – colFirst.col +1)
colLast (2 bytes): A Col structure that specifies the last column in
the series of blank cells within the sheet. This colLast.col value MUST
be greater than colFirst.col value. */
XclAddress aXclPos;
aIn >> aXclPos;
XclAddress aCurrXclPos(aXclPos);
while (true)
for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <= aCurrXclPos.mnCol) && (aIn.GetRecLeft() > 2); ++aCurrXclPos.mnCol )
{
if (aIn.GetRecLeft() < 2)
break;
if (aCurrXclPos.mnCol < aXclPos.mnCol)
break;
sal_uInt16 nXF = aIn.ReaduInt16();
ScAddress aScPos( ScAddress::UNINITIALIZED );
if( GetAddressConverter().ConvertAddress( aScPos, aCurrXclPos, GetCurrScTab(), true ) )
GetXFRangeBuffer().SetBlankXF( aScPos, nXF );
++aCurrXclPos.mnCol;
}
}