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

* Patch from Bart Broersma for issue ID #38622

Browse Source 
git-svn-id: trunk@48962 -
(cherry picked from commit 2aab9b1f9b)
This commit is contained in:
michael 2021-03-14 14:16:16 +00:00 committed by Florian Klämpfl
parent 9da119038e
commit 5e0633199d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/fcl-json/src/fpjson.pp
View File

@ -1014,6 +1014,7 @@ begin
if (U1<>0) then if (U1<>0) then
begin begin
App:={$IFDEF FPC_HAS_CPSTRING}UTF8Encode({$ENDIF}WideChar(U1)+WideChar(U2){$IFDEF FPC_HAS_CPSTRING}){$ENDIF}; App:={$IFDEF FPC_HAS_CPSTRING}UTF8Encode({$ENDIF}WideChar(U1)+WideChar(U2){$IFDEF FPC_HAS_CPSTRING}){$ENDIF};
U1:=0;
U2:=0; U2:=0;
end end
else else

3
packages/fcl-json/tests/testjsondata.pp
View File

@ -4077,6 +4077,9 @@ begin
TestFrom('\u00f8','ø'); // this is ø TestFrom('\u00f8','ø'); // this is ø
TestFrom('\u00f8\"','ø"'); // this is ø" TestFrom('\u00f8\"','ø"'); // this is ø"
TestFrom('\ud83c\udf1f',GlowingStar); TestFrom('\ud83c\udf1f',GlowingStar);
TestFrom('\u0041\u0042','AB'); //issue #0038622
TestFrom('\u0041\u0042\u0043','ABC');
TestFrom('\u0041\u0042\u0043\u0044','ABCD');
end; end;
procedure TTestJSONString.TestStringToJSONString; procedure TTestJSONString.TestStringToJSONString;