paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 04:26:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug #26954

Browse Source 
git-svn-id: trunk@30292 -
This commit is contained in:
michael 2015-03-23 16:50:31 +00:00
parent 743324f72b
commit 5f5883695d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtl/objpas/classes/streams.inc
View File

@ -192,7 +192,7 @@ end;
repeat repeat
r:=Read(PByte(@Buffer)[t],Count); r:=Read(PByte(@Buffer)[t],Count);
inc(t,r); inc(t,r);
until (t=Count) or (r=0); until (t=Count) or (r<=0);
if (t<Count) then if (t<Count) then
Raise EReadError.Create(SReadError); Raise EReadError.Create(SReadError);
end; end;
@ -207,7 +207,7 @@ end;
Repeat Repeat
r:=Write(PByte(@Buffer)[t],Count); r:=Write(PByte(@Buffer)[t],Count);
inc(t,r); inc(t,r);
Until (t=count) or (r=0); Until (t=count) or (r<=0);
if (t<Count) then if (t<Count) then
Raise EWriteError.Create(SWriteError); Raise EWriteError.Create(SWriteError);
end; end;
@ -833,8 +833,11 @@ begin
Result:=Length(FDataString)-FPosition; Result:=Length(FDataString)-FPosition;
If Result>Count then Result:=Count; If Result>Count then Result:=Count;
// This supposes FDataString to be of type AnsiString ! // This supposes FDataString to be of type AnsiString !
Move (Pchar(FDataString)[FPosition],Buffer,Result); if Result>0 then
FPosition:=FPosition+Result; begin
Move (Pchar(FDataString)[FPosition],Buffer,Result);
FPosition:=FPosition+Result;
end;
end; end;