paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-19 10:29:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* another fix for bug #39758, this time the end of the string

Browse Source 
(cherry picked from commit 2df9dd9c14)
This commit is contained in:
marcoonthegit 2022-06-05 17:46:58 +02:00
parent 745e109411
commit 47e90d7dda
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/objpas/sysutils/sysencoding.inc
View File

@ -328,7 +328,7 @@ function TEncoding.GetByteCount(const S: UnicodeString; CharIndex, CharCount: In
begin begin
if (CharIndex < 1) then if (CharIndex < 1) then
raise EEncodingError.CreateFmt(SCharacterIndexOutOfBounds, [CharIndex]); raise EEncodingError.CreateFmt(SCharacterIndexOutOfBounds, [CharIndex]);
if (CharCount < 0) or (Length(S) < CharCount + CharIndex) then if (CharCount < 0) or (Length(S) < CharCount + CharIndex - 1) then
raise EEncodingError.CreateFmt(SInvalidCount, [CharCount]); raise EEncodingError.CreateFmt(SInvalidCount, [CharCount]);
Result := GetByteCount(@S[CharIndex], CharCount); Result := GetByteCount(@S[CharIndex], CharCount);
end; end;
@ -387,7 +387,7 @@ begin
raise EEncodingError.CreateFmt(SInvalidDestinationIndex, [ByteIndex]); raise EEncodingError.CreateFmt(SInvalidDestinationIndex, [ByteIndex]);
if (CharIndex < 1) then if (CharIndex < 1) then
raise EEncodingError.CreateFmt(SCharacterIndexOutOfBounds, [CharIndex]); raise EEncodingError.CreateFmt(SCharacterIndexOutOfBounds, [CharIndex]);
if (CharCount < 0) or (Length(S) < CharCount + CharIndex) then if (CharCount < 0) or (Length(S) < CharCount + CharIndex - 1) then
raise EEncodingError.CreateFmt(SInvalidCount, [CharCount]); raise EEncodingError.CreateFmt(SInvalidCount, [CharCount]);
Result := GetBytes(@S[CharIndex], CharCount, @Bytes[ByteIndex], ByteLen - ByteIndex); Result := GetBytes(@S[CharIndex], CharCount, @Bytes[ByteIndex], ByteLen - ByteIndex);
end; end;