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

MaskEdit: only use the workaround for issue Issue #0038505 (r64617) if compiler version < 3.2.2.

Browse Source 
git-svn-id: branches/fixes_2_0@64635 -
This commit is contained in:
mattias 2021-02-20 20:51:11 +00:00
parent 0501f61b9b
commit 9c41034dda
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/maskedit.pp
View File

@ -1124,10 +1124,13 @@ procedure TCustomMaskEdit.SetEditText(const AValue: string);
//Note: This is not Delphi compatible, but by design
//Delphi lets you just set EditText of any length, which is extremely dangerous!
var
S, OldS: String;
S: String;
i: Integer;
{$if fpc_fullversion < 30202}
OldS: String;
ULen: PtrInt;
ClearCh: TUTF8Char;
{$endif}
begin
if (not IsMasked) then
begin
@ -1142,15 +1145,14 @@ begin
for i := 1 to Utf8Length(S) do
if IsLiteral(FMask[i]) then SetCodePoint(S,i,ClearChar(i));
//Pad resulting string with ClearChar if text is too short
//while Utf8Length(S) < FMaskLength do S := S + ClearChar(Utf8Length(S)+1);
//the above should work again after the release of fpc 3.2.2?
//for the time being do it like this:
{$if fpc_fullversion >= 30202}
while Utf8Length(S) < FMaskLength do S := S + ClearChar(Utf8Length(S)+1);
{$else}
//workaround for fpc issue #0038337
//Utf8Length(S) corrupts S, so concatenation with ClearChar() fails, leading to an endless loop.
//See issue #0038505
while Utf8Length(S) < FMaskLength do
begin
//workaround for fpc issue #0038337
//Utf8Length(S) corrupts S, so concatenation with ClearChar() fails, leading to an endless loop.
//See issue #0038505
OldS := S;
ULen := Utf8Length(S);
ClearCh := ClearChar(Ulen+1);
@ -1158,6 +1160,7 @@ begin
S := OldS + ClearCh;
//debugln(' --> S:',S);
end;
{$endif}
RealSetTextWhileMasked(S);
end;
end;