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

* Fix bug in DelOptions leading to infinite loop:(

Browse Source 
git-svn-id: trunk@20721 -
This commit is contained in:
pierre 2012-04-06 15:15:48 +00:00
parent 84f0d3d99a
commit c5f9b66e51
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/utils/dotest.pp
View File

@ -765,7 +765,7 @@ end;
function DelOptions(Pattern, opts : string) : string;
var
currentopt : string;
optpos, endopt, endpos : longint;
optpos, endopt, startpos, endpos : longint;
iswild : boolean;
begin
opts:=trimspace(opts);
@ -785,30 +785,41 @@ begin
end
else
iswild:=false;
startpos:=1;
repeat
optpos:=pos(currentopt,opts);
optpos:=pos(currentopt,copy(opts,startpos,length(opts)));
if optpos>0 then
begin
{ move to index in full opts string }
optpos:=optpos+startpos-1;
{ compute position of end of opt }
endopt:=optpos+length(currentopt);
{ use that end as start position for next round }
startpos:=endopt;
if iswild then
begin
while (opts[endopt]<>' ') and
(endopt<length(opts)) do
inc(endopt);
begin
inc(endopt);
inc(startpos);
end;
Verbose(V_Debug,'Pattern match found "'+currentopt+'*" in "'+opts+'"');
system.delete(opts,optpos,endopt-optpos+1);
Verbose(V_Debug,'After opts="'+opts+'"');
end
else
begin
if (endopt=length(opts)) or (opts[endopt]=' ') then
if (endopt>length(opts)) or (opts[endopt]=' ') then
begin
Verbose(V_Debug,'Exact match found "'+currentopt+'" in "'+opts+'"');
system.delete(opts,optpos,endopt-optpos+1);
Verbose(V_Debug,'After opts="'+opts+'"');
end
else
Verbose(V_Debug,'No exact match "'+currentopt+'" in "'+opts+'"');
begin
Verbose(V_Debug,'No exact match "'+currentopt+'" in "'+opts+'"');
end;
end;
end;