pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix range-check-error when reading an xls file with header/footer (issue #34177, patch by Domenico Mammola)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6612 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-08-24 11:27:21 +00:00
parent bf81dd876e
commit 0d87d88c08
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/fpspreadsheet/source/common/xlsbiff8.pas
View File

@ -2355,6 +2355,9 @@ begin
exit;
len := WordLEToN(AStream.ReadWord);
if len = 0 then
exit;
s := ReadWideString(AStream, len, rtParams);
with (FWorksheet as TsWorksheet).Pagelayout do
if AIsHeader then

5
components/fpspreadsheet/source/common/xlscommon.pas
View File

@ -1977,7 +1977,10 @@ begin
if RecordSize = 0 then
exit;
Len := AStream.ReadByte;
len := AStream.ReadByte;
if len = 0 then
exit;
SetLength(s, len*SizeOf(ansichar));
AStream.ReadBuffer(s[1], len*SizeOf(ansichar));
with TsWorksheet(FWorksheet).PageLayout do