paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 17:49:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* prevent endless loop when writing an invalid utf-8 sequence longer than

Browse Source 
32 bytes using writestr to a unicode/widestring

git-svn-id: trunk@26326 -
This commit is contained in:
Jonas Maebe 2013-12-30 14:30:56 +00:00
parent 63c1a05718
commit de59d6ac11
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtl/inc/text.inc
View File

@ -2259,7 +2259,15 @@ begin
{ we did not yet get all bytes of the last code point -> handle { we did not yet get all bytes of the last code point -> handle
everything until the start of this character } everything until the start of this character }
if codepointlen>lenfound+1 then if codepointlen>lenfound+1 then
if i<>0 then
result:=i result:=i
{ the buffer is too small to contain the entire utf-8 code point
-> nothing else to do but handle the entire buffer (and end up
with an invalid character) -- since writestr uses the default
buffer size of 32 bytes, this can only happen for invalid utf-8
encodings }
else
result:=t.bufpos
{ the last code point is invalid -> handle everything since it can't { the last code point is invalid -> handle everything since it can't
become valid by adding more bytes; in case it's complete, we also become valid by adding more bytes; in case it's complete, we also
handle everything, of course} handle everything, of course}