paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-06 15:58:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

* More strict behaviour of TStreamReader after close

Browse Source 
git-svn-id: trunk@34728 -
This commit is contained in:
michael 2016-10-16 10:22:10 +00:00
parent 8c1ebcd4ad
commit 3b1980b8f3
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/fcl-base/src/streamex.pp
View File

@ -103,6 +103,7 @@ type
private private
FBufferRead: Integer; FBufferRead: Integer;
FBufferPosition: Integer; FBufferPosition: Integer;
FClosed,
FOwnsStream: Boolean; FOwnsStream: Boolean;
FStream: TStream; FStream: TStream;
FBuffer: array of Byte; FBuffer: array of Byte;
@ -348,6 +349,7 @@ begin
raise EArgumentException.CreateFmt(SParamIsNil, ['AStream']); raise EArgumentException.CreateFmt(SParamIsNil, ['AStream']);
FStream := AStream; FStream := AStream;
FOwnsStream := AOwnsStream; FOwnsStream := AOwnsStream;
FClosed:=False;
if ABufferSize >= MIN_BUFFER_SIZE then if ABufferSize >= MIN_BUFFER_SIZE then
SetLength(FBuffer, ABufferSize) SetLength(FBuffer, ABufferSize)
else else
@ -367,9 +369,17 @@ end;
procedure TStreamReader.FillBuffer; procedure TStreamReader.FillBuffer;
begin begin
FBufferRead := FStream.Read(FBuffer[0], Pred(Length(FBuffer))); if FClosed then
FBuffer[FBufferRead] := 0; begin
FBufferPosition := 0; FBufferRead:=0;
FBufferPosition:=0;
end
else
begin
FBufferRead := FStream.Read(FBuffer[0], Pred(Length(FBuffer)));
FBuffer[FBufferRead] := 0;
FBufferPosition := 0;
end;
end; end;
procedure TStreamReader.Reset; procedure TStreamReader.Reset;
@ -383,15 +393,13 @@ end;
procedure TStreamReader.Close; procedure TStreamReader.Close;
begin begin
if FOwnsStream then if FOwnsStream then
begin FreeAndNil(FStream);
FStream.Free; FClosed:=True;
FStream := nil;
end;
end; end;
function TStreamReader.IsEof: Boolean; function TStreamReader.IsEof: Boolean;
begin begin
if not Assigned(FStream) then if FClosed or not Assigned(FStream) then
Exit(True); Exit(True);
Result := FBufferPosition >= FBufferRead; Result := FBufferPosition >= FBufferRead;
if Result then if Result then
@ -408,6 +416,7 @@ var
begin begin
VPosition := FBufferPosition; VPosition := FBufferPosition;
SetLength(AString, 0); SetLength(AString, 0);
if FClosed then exit;
repeat repeat
VPByte := @FBuffer[FBufferPosition]; VPByte := @FBuffer[FBufferPosition];
while (FBufferPosition < FBufferRead) and not (VPByte^ in [10, 13]) do while (FBufferPosition < FBufferRead) and not (VPByte^ in [10, 13]) do