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

fpspreadsheet: Fixes a bug with the STT table of strings and the CONTINUE record. The bug prevented reading STT strings after the CONTINUE

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2676 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2013-02-12 14:49:43 +00:00
parent b74fcb2b85
commit 698d941bf1
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
components/fpspreadsheet/xlsbiff8.pas
View File

@@ -48,6 +48,7 @@ unit xlsbiff8;
// The new OLE code is much better, so always use it // The new OLE code is much better, so always use it
{$define USE_NEW_OLE} {$define USE_NEW_OLE}
{.$define XLSDEBUG}
interface interface
@@ -1401,9 +1402,9 @@ begin
if StringFlags and 1 = 1 Then begin if StringFlags and 1 = 1 Then begin
//String is WideStringLE //String is WideStringLE
if (ALength*SizeOf(WideChar)) > PendingRecordSize then begin if (ALength*SizeOf(WideChar)) > PendingRecordSize then begin
SetLength(Result,PendingRecordSize); SetLength(Result,PendingRecordSize div 2);
AStream.ReadBuffer(Result[1],PendingRecordSize * SizeOf(WideChar)); AStream.ReadBuffer(Result[1],PendingRecordSize);
Dec(PendingRecordSize,PendingRecordSize * SizeOf(WideChar)); Dec(PendingRecordSize,PendingRecordSize);
end else begin end else begin
SetLength(Result,ALength); SetLength(Result,ALength);
AStream.ReadBuffer(Result[1],ALength * SizeOf(WideChar)); AStream.ReadBuffer(Result[1],ALength * SizeOf(WideChar));
@@ -1841,7 +1842,7 @@ end;
procedure TsSpreadBIFF8Reader.ReadSST(const AStream: TStream); procedure TsSpreadBIFF8Reader.ReadSST(const AStream: TStream);
var var
Items: DWORD; Items: DWORD;
StringLength: WORD; StringLength, CurStrLen: WORD;
LString: String; LString: String;
ContinueIndicator: WORD; ContinueIndicator: WORD;
begin begin
@@ -1862,25 +1863,36 @@ begin
StringLength:=WordLEtoN(AStream.ReadWord); StringLength:=WordLEtoN(AStream.ReadWord);
Dec(PendingRecordSize,2); Dec(PendingRecordSize,2);
LString:=''; LString:='';
while PendingRecordSize>0 do begin
if StringLength>0 then begin // This loop takes care of the string being split between the STT and the CONTINUE, or between CONTINUE records
while PendingRecordSize>0 do
begin
if StringLength>0 then
begin
//Read a stream of zero length reads all the stream. //Read a stream of zero length reads all the stream.
LString:=LString+ReadString(AStream,StringLength); LString:=LString+ReadString(AStream, StringLength);
end else begin end
else
begin
//String of 0 chars in length, so just read it empty, reading only the mandatory flags //String of 0 chars in length, so just read it empty, reading only the mandatory flags
AStream.ReadByte; //And discard it. AStream.ReadByte; //And discard it.
Dec(PendingRecordSize); Dec(PendingRecordSize);
//LString:=LString+''; //LString:=LString+'';
end; end;
if (PendingRecordSize=0) and (Items>1) then begin
// Check if the record finished and we need a CONTINUE record to go on
if (PendingRecordSize<=0) and (Items>1) then
begin
//A Continue will happend, read the //A Continue will happend, read the
//tag and continue linking... //tag and continue linking...
ContinueIndicator:=WordLEtoN(AStream.ReadWord); ContinueIndicator:=WordLEtoN(AStream.ReadWord);
if ContinueIndicator<>INT_EXCEL_ID_CONTINUE then begin if ContinueIndicator<>INT_EXCEL_ID_CONTINUE then begin
Raise Exception.Create('Expected CONTINUE not found.'); Raise Exception.Create('[TsSpreadBIFF8Reader.ReadSST] Expected CONTINUE record not found.');
end; end;
PendingRecordSize:=WordLEtoN(AStream.ReadWord); PendingRecordSize:=WordLEtoN(AStream.ReadWord);
Dec(StringLength,Length(UTF8ToUTF16(LString))); //Dec the used chars CurStrLen := Length(UTF8ToUTF16(LString));
if StringLength<CurStrLen then Exception.Create('[TsSpreadBIFF8Reader.ReadSST] StringLength<CurStrLen');
Dec(StringLength, CurStrLen); //Dec the used chars
if StringLength=0 then break; if StringLength=0 then break;
end else begin end else begin
break; break;