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

* Explicitly increment and decrement ref count to keep copy of destination string in fpc_AnsiStr_Concat_multi and fpc_WideStr_Concat_multi. It prevents note "Local variable "destcopy" is assigned but never used".

Browse Source 
git-svn-id: trunk@9554 -
This commit is contained in:
yury 2007-12-28 00:02:35 +00:00
parent eadfbb5027
commit cd03a2893b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/inc/astrings.inc
View File

@ -250,13 +250,14 @@ Var
p,pc : pointer;
Size,NewLen,
OldDestLen : SizeInt;
destcopy : ansistring;
destcopy : pointer;
begin
if high(sarr)=0 then
begin
DestS:='';
exit;
end;
destcopy:=nil;
lowstart:=low(sarr);
if Pointer(DestS)=Pointer(sarr[lowstart]) then
inc(lowstart);
@ -269,7 +270,8 @@ begin
{ 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;
destcopy:=pointer(dests);
fpc_AnsiStr_Incr_Ref(destcopy);
lowstart:=low(sarr);
break;
end;
@ -298,6 +300,7 @@ begin
inc(pc,size);
end;
end;
fpc_AnsiStr_Decr_Ref(destcopy);
end;

7
rtl/inc/wustrings.inc
View File

@ -578,13 +578,14 @@ Var
p,pc : pointer;
Size,NewLen,
OldDestLen : SizeInt;
destcopy : widestring;
destcopy : pointer;
begin
if high(sarr)=0 then
begin
DestS:='';
exit;
end;
destcopy:=nil;
lowstart:=low(sarr);
if Pointer(DestS)=Pointer(sarr[lowstart]) then
inc(lowstart);
@ -597,7 +598,8 @@ begin
{ 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;
destcopy:=pointer(dests);
fpc_WideStr_Incr_Ref(destcopy);
lowstart:=low(sarr);
break;
end;
@ -626,6 +628,7 @@ begin
inc(pc,size*sizeof(WideChar));
end;
end;
fpc_WideStr_Decr_Ref(destcopy);
end;
{$endif STR_CONCAT_PROCS}