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

LCL: Read a streamed WideString CollectionItem property correctly. Issue , patch from Anton Kavalenka.

Browse Source 
git-svn-id: trunk@59586 -
This commit is contained in:
juha 2018-11-18 10:34:29 +00:00
parent 95d0c815b2
commit a3b056875f
1 changed files with 11 additions and 13 deletions

24
lcl/lresources.pp
View File

@ -374,8 +374,8 @@ type
procedure HandleAlphaNum;
procedure HandleNumber;
procedure HandleHexNumber;
function HandleQuotedString : string;
function HandleDecimalString(var IsWideString: Boolean): string;
function HandleQuotedString: string;
function HandleDecimalString: string;
procedure HandleString;
procedure HandleMinus;
procedure HandleUnknown;
@ -5628,8 +5628,9 @@ begin
end;
end;
function TUTF8Parser.HandleDecimalString(var IsWideString: Boolean): string;
var i : integer;
function TUTF8Parser.HandleDecimalString: string;
var
i: integer;
begin
Result:='';
inc(fPos);
@ -5642,13 +5643,7 @@ begin
end;
if not TryStrToInt(Result,i) then
i:=0;
if i > 255 then begin
Result:=UnicodeToUTF8(i); // widestring
IsWideString:=true;
end else if i > 127 then
Result:=SysToUTF8(chr(i)) // windows codepage
else
Result:=chr(i); // ascii, does not happen
Result:=UnicodeToUTF8(i); // widestring
end;
procedure TUTF8Parser.HandleString;
@ -5660,12 +5655,15 @@ begin
while true do begin
case fBuf[fPos] of
'''' : fLastTokenStr:=fLastTokenStr+HandleQuotedString;
'#' : fLastTokenStr:=fLastTokenStr+HandleDecimalString(IsWideString);
'#' : begin
fLastTokenStr:=fLastTokenStr+HandleDecimalString;
IsWideString:=true;
end;
else break;
end;
end;
if IsWideString then
fToken:=toWString
fToken:=Classes.toWString
else
fToken:=Classes.toString;
end;