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

fpspreadsheet: Fix biff8 reader crashing with file containing SST and CONTINUE records and asian phonetic string in SST record.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4178 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-06-04 17:00:21 +00:00
parent 80738eec17
commit 40644ea5d5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/fpspreadsheet/xlsbiff8.pas
View File

@@ -550,6 +550,7 @@ begin
//Asian phonetics
//Read Asian phonetics Length (not used)
AsianPhoneticBytes := DWordLEtoN(AStream.ReadDWord);
dec(PendingRecordSize,4);
end;
if StringFlags and 8 = 8 then begin
//Rich string
@@ -597,7 +598,7 @@ begin
//Rich string (This only happened in BIFF8)
for j := 1 to RunsCounter do begin
if (PendingRecordSize <= 0) then begin
//A CONTINUE may happend here
//A CONTINUE may happened here
RecordType := WordLEToN(AStream.ReadWord);
RecordSize := WordLEToN(AStream.ReadWord);
if RecordType <> INT_EXCEL_ID_CONTINUE then begin
@@ -616,6 +617,7 @@ begin
//Read Asian phonetics, discarded as not used.
SetLength(AnsiStrValue, AsianPhoneticBytes);
AStream.ReadBuffer(AnsiStrValue[1], AsianPhoneticBytes);
dec(PendingRecordSize, AsianPhoneticBytes);
end;
end;