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

TMaskEdit: implement rangechecking when accessing FMask.

Browse Source 
git-svn-id: trunk@64792 -
This commit is contained in:
bart 2021-03-12 17:59:02 +00:00
parent 427fdc1588
commit d87e10f082
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lcl/maskedit.pp
View File

@ -140,6 +140,7 @@ type
const
SInvalidCodePoint = 'The (hexadecimal) sequence %s is not a valid UTF8 codepoint.';
SIndexOutOfRangeForFMask = 'Range check error trying to access FMask[%d]. Index should be between 1 and %d';
{ ***********************************************************************************************
@ -208,6 +209,7 @@ const
FOnValidationError: TNotifyEvent;
procedure ClearInternalMask(out AMask: TInternalMask; out ALengthIndicator: Integer);
procedure CheckRange(Index: Integer);
procedure AddToMask(ALiteral: TUtf8Char);
procedure AddToMask(AMaskType: TMaskedType);
function GetModified: Boolean;
@ -528,6 +530,12 @@ begin
{$POP}
end;
procedure TCustomMaskEdit.CheckRange(Index: Integer);
begin
if (Index < 1) or (Index > FMaskLength) then
raise ERangeError.CreateFmt(SIndexOutOfRangeForFMask,[Index, FMaskLength]);
end;
procedure TCustomMaskEdit.AddToMask(ALiteral: TUtf8Char);
begin
Inc(FMaskLength);
@ -883,6 +891,7 @@ procedure TCustomMaskEdit.JumpToNextDot(Dot: Char);
i: Integer;
begin
Result := 0;
CheckRange(Start);
for i := Start to FMaskLength do
begin
if (FMask[i].MaskType = Char_IsLiteral) and (FMask[i].Literal = Sub) then
@ -955,6 +964,7 @@ end;
//Return if the index passed contains a literal in FMask (so it cannot be altered)
function TCustomMaskEdit.IsLiteral(Index: Integer): Boolean;
begin
CheckRange(Index);
Result := (FMask[Index].MaskType in [Char_IsLiteral, Char_HourSeparator, Char_DateSeparator]);
end;
@ -984,7 +994,8 @@ var
Ok: Boolean;
begin
Result := False;
if (Position < 1) or (Position > FMaskLength) then Exit;
CheckRange(Position);
//if (Position < 1) or (Position > FMaskLength) then Exit;
Current := FMask[Position].MaskType;
case Current Of
Char_Number : OK := (Length(Ch) = 1) and (Ch[1] In ['0'..'9',#32]);
@ -1208,6 +1219,7 @@ end;
function TCustomMaskEdit.ClearChar(Position : Integer) : TUtf8Char;
begin
//For Delphi compatibilty, only literals remain, all others will be blanked
CheckRange(Position);
case FMask[Position].MaskType Of
Char_Number,
Char_NumberFixed,
@ -1280,6 +1292,7 @@ function TCustomMaskEdit.CanInsertChar(Position: Integer; var Ch: TUtf8Char;
Var
Current : tMaskedType;
Begin
CheckRange(Position);
Current := FMask[Position].MaskType;
Result := False;