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

* fix concat_multi for widestrings, patch was already done for ansistrings fixes 8292

Browse Source 
git-svn-id: trunk@6384 -
This commit is contained in:
peter 2007-02-09 12:28:22 +00:00
parent 99bc1ccb75
commit ebccbf720c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtl/inc/wstrings.inc
View File

@ -501,6 +501,7 @@ Var
p,pc : pointer;
Size,NewLen,
OldDestLen : SizeInt;
destcopy : widestring;
begin
if high(sarr)=0 then
begin
@ -509,17 +510,19 @@ begin
end;
lowstart:=low(sarr);
if Pointer(DestS)=Pointer(sarr[lowstart]) then
inc(lowstart);
{ Check for another reuse, then we can't use
the append optimization }
for i:=lowstart to high(sarr) do
begin
inc(lowstart);
{ Check for another reuse, then we can't use
the append optimization }
for i:=lowstart to high(sarr) do
if Pointer(DestS)=Pointer(sarr[i]) then
begin
if Pointer(DestS)=Pointer(sarr[i]) then
begin
lowstart:=low(sarr);
break;
end;
{ if DestS is used somewhere in the middle of the expression,
we need to make sure the original string still exists after
we empty/modify DestS }
destcopy:=dests;
lowstart:=low(sarr);
break;
end;
end;
{ Start with empty DestS if we start with concatting