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

* fixed missing range checks in r33056

Browse Source 
* fixed pos(unicodestring) with a non-zero offset added in r33056 (fixes
    tests/test/units/system/tstring.pp)

git-svn-id: trunk@33120 -
This commit is contained in:
Jonas Maebe 2016-02-25 19:56:49 +00:00
parent 03d4ada29e
commit 0deacf9fba
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
rtl/inc/ustrings.inc
View File

@ -1166,7 +1166,7 @@ var
pc : punicodechar;
begin
Pos:=0;
if Length(SubStr)>0 then
if (Length(SubStr)>0) and (Offset>0) and (Offset<=Length(Source)) then
begin
MaxLen:=Length(source)-Length(SubStr)-(OffSet-1);
i:=0;
@ -1177,7 +1177,7 @@ begin
if (SubStr[1]=pc^) and
(CompareWord(Substr[1],pc^,Length(SubStr))=0) then
begin
Pos:=i;
Pos:=Offset+i-1;
exit;
end;
inc(pc);
@ -1195,15 +1195,18 @@ var
i: SizeInt;
pc : punicodechar;
begin
pc:=@s[OffSet];
for i:=OffSet to length(s) do
if (Offset>0) and (Offset<=length(s)) then
begin
if pc^=c then
begin
pos:=i;
exit;
end;
inc(pc);
pc:=@s[OffSet];
for i:=OffSet to length(s) do
begin
if pc^=c then
begin
pos:=i;
exit;
end;
inc(pc);
end;
end;
pos:=0;
end;
@ -1241,17 +1244,20 @@ var
wc : unicodechar;
pc : punicodechar;
begin
wc:=c;
pc:=@s[OffSet];
for i:=OffSet to length(s) do
begin
if pc^=wc then
begin
pos:=i;
exit;
end;
inc(pc);
end;
if (Offset>0) and (Offset<=Length(S)) then
begin
wc:=c;
pc:=@s[OffSet];
for i:=OffSet to length(s) do
begin
if pc^=wc then
begin
pos:=i;
exit;
end;
inc(pc);
end;
end;
pos:=0;
end;
{$endif FPC_HAS_POS_CHAR_UNICODESTR}