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

LazUtils: Fix UTF8StringReplace when Pattern and LowerCase(Pattern) have different lengths. Issue #41291.

Browse Source
This commit is contained in:
Juha 2025-02-22 10:16:00 +02:00
parent 4d91692a6d
commit 4ac85baf37
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/lazutils/lazutf8.pas
View File

@ -1207,7 +1207,7 @@ function UTF8StringReplace(const S, OldPattern, NewPattern: String;
var var
SrcS, OldPtrn: string; SrcS, OldPtrn: string;
PSrc, POrig: PChar; PSrc, POrig: PChar;
CharLen, OldPatLen, l: Integer; CharLen, OldPatLen, OldPatCodepoints, l: Integer;
OkToReplace: Boolean; OkToReplace: Boolean;
begin begin
Count := 0; Count := 0;
@ -1223,6 +1223,7 @@ begin
OldPtrn := OldPattern; OldPtrn := OldPattern;
end; end;
OldPatLen := Length(OldPtrn); OldPatLen := Length(OldPtrn);
OldPatCodepoints := UTF8CodepointCount(OldPtrn);
PSrc := PChar(SrcS); PSrc := PChar(SrcS);
POrig := PChar(S); POrig := PChar(S);
Result := ''; Result := '';
@ -1235,21 +1236,23 @@ begin
Inc(Count); Inc(Count);
Result := Result + NewPattern; Result := Result + NewPattern;
Inc(PSrc, OldPatLen); // Skip the found string Inc(PSrc, OldPatLen); // Skip the found string
// Move forward also in original string. // Move forward also in original string one codepoint at a time.
Inc(POrig, Length(OldPattern)); // Lengths of a pattern and its lowercase version may differ.
for l := 1 to OldPatCodepoints do
Inc(POrig, UTF8CodepointSize(POrig)); // Next codepoint
if not (rfReplaceAll in Flags) then if not (rfReplaceAll in Flags) then
OkToReplace := False; // Replace only once. OkToReplace := False; // Replace only once.
end end
else begin else begin
// Move forward in possibly lowercased string // Move forward in possibly lowercased string
CharLen := UTF8CodepointSize(PSrc); CharLen := UTF8CodepointSize(PSrc);
Inc(PSrc, CharLen); // Next Codepoint Inc(PSrc, CharLen); // Next codepoint
// Copy a codepoint from original string and move forward // Copy a codepoint from original string and move forward
CharLen := UTF8CodepointSize(POrig); CharLen := UTF8CodepointSize(POrig);
l := Length(Result); l := Length(Result);
SetLength(Result, l+CharLen); // Copy one codepoint from original string SetLength(Result, l+CharLen); // Copy one codepoint from original string
System.Move(POrig^, Result[l+1], CharLen); System.Move(POrig^, Result[l+1], CharLen);
Inc(POrig, CharLen); // Next Codepoint Inc(POrig, CharLen); // Next codepoint
end; end;
end; end;
end; end;