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

* fixed fpc_AnsiStr_Concat in case when strings the same.

Browse Source 
git-svn-id: trunk@5958 -
This commit is contained in:
yury 2007-01-13 23:44:59 +00:00
parent 2602ceb7e4
commit 97e6235535
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/inc/astrings.inc
View File

@ -203,6 +203,7 @@ end;
procedure fpc_AnsiStr_Concat (var DestS:ansistring;const S1,S2 : AnsiString); compilerproc;
Var
Size,Location : SizeInt;
same : boolean;
begin
{ only assign if s1 or s2 is empty }
if (S1='') then
@ -220,8 +221,12 @@ begin
{ Use Pointer() typecasts to prevent extra conversion code }
if Pointer(DestS)=Pointer(S1) then
begin
same:=Pointer(S1)=Pointer(S2);
SetLength(DestS,Size+Location);
Move(Pointer(S2)^,(Pointer(DestS)+Location)^,Size+1);
if same then
Move(Pointer(DestS)^,(Pointer(DestS)+Location)^,Size)
else
Move(Pointer(S2)^,(Pointer(DestS)+Location)^,Size+1);
end
else if Pointer(DestS)=Pointer(S2) then
begin