paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-01 12:50:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* use Reallocmem in TStream.Realloc

Browse Source 
* prevent setting the capacity < 0, which will give an RTE when
    passed to the heap manager

git-svn-id: trunk@566 -
This commit is contained in:
peter 2005-07-03 13:20:06 +00:00
parent cb5e8fc609
commit 73e0105080
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -589,26 +589,19 @@ function TMemoryStream.Realloc(var NewCapacity: Longint): Pointer;
Var MoveSize : Longint; Var MoveSize : Longint;
begin begin
If NewCapacity>0 Then // round off to block size. // round off to block size.
If NewCapacity<0 Then
NewCapacity:=0
else
NewCapacity := (NewCapacity + (TMSGrow-1)) and not (TMSGROW-1); NewCapacity := (NewCapacity + (TMSGrow-1)) and not (TMSGROW-1);
// Only now check ! // Only now check !
If NewCapacity=FCapacity then If NewCapacity=FCapacity then
Result:=FMemory Result:=FMemory
else
If NewCapacity=0 then
FreeMem (FMemory,Fcapacity)
else else
begin begin
GetMem (Result,NewCapacity); Result:=Reallocmem(FMemory,Newcapacity);
If Result=Nil then If Result=Nil then
Raise EStreamError.Create(SMemoryStreamError); Raise EStreamError.Create(SMemoryStreamError);
If FCapacity>0 then
begin
MoveSize:=FSize;
If MoveSize>NewCapacity then MoveSize:=NewCapacity;
Move (Fmemory^,Result^,MoveSize);
FreeMem (FMemory,FCapacity);
end;
end; end;
end; end;