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

* UTF8 strings read as normal strings, not widestrings (bug reported by Stefan Lechner)

Browse Source 
git-svn-id: trunk@11047 -
This commit is contained in:
michael 2008-05-23 07:52:04 +00:00
parent a2c012e228
commit 0ad7cfe39b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtl/objpas/classes/reader.inc
View File

@ -1340,9 +1340,13 @@ var
StringType: TValueType; StringType: TValueType;
begin begin
StringType := FDriver.ReadValue; StringType := FDriver.ReadValue;
if StringType in [vaString, vaLString] then if StringType in [vaString, vaLString,vaUTF8String] then
Result := FDriver.ReadString(StringType) begin
else if StringType in [vaWString,vaUTF8String] then Result := FDriver.ReadString(StringType);
if (StringType=vaUTF8String) then
Result:=utf8Decode(Result);
end
else if StringType in [vaWString] then
Result:= FDriver.ReadWidestring Result:= FDriver.ReadWidestring
else else
raise EReadError.Create(SInvalidPropertyValue); raise EReadError.Create(SInvalidPropertyValue);