mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-13 09:39:09 +02:00
* avoid a range check error
git-svn-id: trunk@6064 -
This commit is contained in:
parent
67fd7833cd
commit
2c09c499ab
@ -151,7 +151,7 @@ var
|
|||||||
bufptr := @buf[0];
|
bufptr := @buf[0];
|
||||||
fpread(f, buf, bufsize);
|
fpread(f, buf, bufsize);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function readbufbyte: byte;
|
function readbufbyte: byte;
|
||||||
begin
|
begin
|
||||||
if bufptr > @buf[bufsize-1] then
|
if bufptr > @buf[bufsize-1] then
|
||||||
@ -159,14 +159,14 @@ var
|
|||||||
readbufbyte := bufptr^;
|
readbufbyte := bufptr^;
|
||||||
inc(bufptr);
|
inc(bufptr);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function readbuf(var dest; count: integer): integer;
|
function readbuf(var dest; count: integer): integer;
|
||||||
var
|
var
|
||||||
numbytes: integer;
|
numbytes: integer;
|
||||||
begin
|
begin
|
||||||
readbuf := 0;
|
readbuf := 0;
|
||||||
repeat
|
repeat
|
||||||
numbytes := @buf[bufsize-1] - bufptr + 1;
|
numbytes := (@buf[bufsize-1] + 1) - bufptr;
|
||||||
if numbytes > count then
|
if numbytes > count then
|
||||||
numbytes := count;
|
numbytes := count;
|
||||||
if numbytes > 0 then
|
if numbytes > 0 then
|
||||||
@ -178,7 +178,7 @@ var
|
|||||||
end;
|
end;
|
||||||
if count > 0 then
|
if count > 0 then
|
||||||
readfilebuf
|
readfilebuf
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
until false;
|
until false;
|
||||||
end;
|
end;
|
||||||
|
Loading…
Reference in New Issue
Block a user