mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-17 01:39:26 +02:00
* fixed copying of remaining elements
git-svn-id: trunk@7699 -
This commit is contained in:
parent
3eaceafad3
commit
ea97b8b137
@ -148,7 +148,7 @@ begin
|
|||||||
case PByte(TypeInfo)^ of
|
case PByte(TypeInfo)^ of
|
||||||
tkAstring :
|
tkAstring :
|
||||||
begin
|
begin
|
||||||
fpc_AnsiStr_Decr_Ref(PPointer(Data)^);
|
fpc_AnsiStr_Decr_Ref(PPointer(Data)^);
|
||||||
PPointer(Data)^:=nil;
|
PPointer(Data)^:=nil;
|
||||||
end;
|
end;
|
||||||
tkWstring :
|
tkWstring :
|
||||||
@ -299,6 +299,9 @@ begin
|
|||||||
copiedsize:=fpc_Copy_internal(Src+Offset,Dest+Offset,Info);
|
copiedsize:=fpc_Copy_internal(Src+Offset,Dest+Offset,Info);
|
||||||
expectedoffset:=Offset+copiedsize;
|
expectedoffset:=Offset+copiedsize;
|
||||||
end;
|
end;
|
||||||
|
{ elements remaining? }
|
||||||
|
if result>expectedoffset then
|
||||||
|
move((Src+expectedoffset)^,(Dest+expectedoffset)^,Result-expectedoffset);
|
||||||
end;
|
end;
|
||||||
tkDynArray:
|
tkDynArray:
|
||||||
begin
|
begin
|
||||||
|
Loading…
Reference in New Issue
Block a user