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

Avoid accessing inputStr or Wilds strings past their sizes: maxinputword and maxwilds

Browse Source 
git-svn-id: trunk@38653 -
This commit is contained in:
pierre 2018-03-31 15:46:55 +00:00
parent 0fa83eade8
commit e6fd693ea8
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/rtl-objpas/src/inc/strutils.pp
View File

@ -2764,14 +2764,33 @@ end;
Function isMatch(level : integer;inputstr,wilds : string; CWild, CinputWord: SizeInt;MaxInputword,maxwilds : SizeInt; Out EOS : Boolean) : Boolean;
function WildisQuestionmark : boolean;
begin
Result:=CWild <= MaxWilds;
if Result then
Result:= Wilds[CWild]='?';
end;
function WildisStar : boolean;
begin
Result:=CWild <= MaxWilds;
if Result then
Result:= Wilds[CWild]='*';
end;
begin
EOS:=False;
Result:=True;
repeat
if Wilds[CWild] = '*' then { handling of '*' }
if WildisStar then { handling of '*' }
begin
inc(CWild);
while Wilds[CWild] = '?' do { equal to '?' }
if CWild>MaxWilds then
begin
EOS:=true;
exit;
end;
while WildisQuestionmark do { equal to '?' }
begin
{ goto next letter }
inc(CWild);
@ -2779,7 +2798,7 @@ begin
end;
{ increase until a match }
Repeat
while (inputStr[CinputWord]<>Wilds[CWild]) and (CinputWord <= MaxinputWord) do
while (CinputWord <= MaxinputWord) and (CWild <= MaxWilds) and (inputStr[CinputWord]<>Wilds[CWild]) do
inc(CinputWord);
Result:=isMatch(Level+1,inputstr,wilds,CWild, CinputWord,MaxInputword,maxwilds,EOS);
if not Result then
@ -2789,14 +2808,14 @@ begin
Exit;
Continue;
end;
if Wilds[CWild] = '?' then { equal to '?' }
if WildisQuestionmark then { equal to '?' }
begin
{ goto next letter }
inc(CWild);
inc(CinputWord);
Continue;
end;
if inputStr[CinputWord] = Wilds[CWild] then { equal letters }
if (CinputWord>MaxinputWord) or (CWild > MaxWilds) or (inputStr[CinputWord] = Wilds[CWild]) then { equal letters }
begin
{ goto next letter }
inc(CWild);