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

improve r14255 #9e72cfb939 and fix more range check errors

Browse Source 
git-svn-id: trunk@14256 -
This commit is contained in:
paul 2008-02-26 10:14:34 +00:00
parent 9e72cfb939
commit 496e37f1d4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/stringhashlist.pas
View File

@ -216,7 +216,7 @@ end;
function TStringHashList.Find(const S: String): Integer;
var
Value: Integer;
Value: Cardinal;
First, Last, Temp, I: Integer;
begin
Value:= HashOf(s);
@ -227,7 +227,7 @@ begin
begin
Temp:= (First + Last) div 2;
case CompareValue(Value, FList[Temp]^.HashValue) of
1: First:= Temp +1;
1: First:= Temp + 1;
0:
begin
Result:= Temp;
@ -268,9 +268,10 @@ var
begin
P:= PChar(Key);
Len:= Length(Key);
Result := Len;
{$IFOPT R+}{$DEFINE RangeChecking}{$ENDIF}
{$R-}
Result := Len;
{$IFOPT R+}{$DEFINE RangeChecking}{$ELSE}{$UNDEF RangeChecking}{$ENDIF}
{$IFOPT Q+}{$DEFINE OverflowChecking}{$ELSE}{$UNDEF OverflowChecking}{$ENDIF}
{$R-}{Q-}
// use the last 30 characters to compute the hash
case fCaseSensitive of
True:
@ -280,6 +281,7 @@ begin
for I := Len - 1 downto 0 do
inc(Result, cardinal(ord(UpperCaseChars[P[I]])) shl I);
end;
{$IFDEF OverflowChecking}{$Q+}{$UNDEF OverflowChecking}{$ENDIF}
{$IFDEF RangeChecking}{$R+}{$UNDEF RangeChecking}{$ENDIF}
end;