From 2aab9b1f9bc47b84b10449b2ab43ddb30ec35335 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sun, 14 Mar 2021 14:16:16 +0000
Subject: [PATCH] * Patch from Bart Broersma for issue ID #38622

git-svn-id: trunk@48962 -
---
 packages/fcl-json/src/fpjson.pp         | 1 +
 packages/fcl-json/tests/testjsondata.pp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/packages/fcl-json/src/fpjson.pp b/packages/fcl-json/src/fpjson.pp
index f4acce05a1..6efe8ab784 100644
--- a/packages/fcl-json/src/fpjson.pp
+++ b/packages/fcl-json/src/fpjson.pp
@@ -1014,6 +1014,7 @@ begin
                 if (U1<>0) then
                   begin
                   App:={$IFDEF FPC_HAS_CPSTRING}UTF8Encode({$ENDIF}WideChar(U1)+WideChar(U2){$IFDEF FPC_HAS_CPSTRING}){$ENDIF};
+                  U1:=0;
                   U2:=0;
                   end
                 else
diff --git a/packages/fcl-json/tests/testjsondata.pp b/packages/fcl-json/tests/testjsondata.pp
index 5c73c7489a..a89d7cc600 100644
--- a/packages/fcl-json/tests/testjsondata.pp
+++ b/packages/fcl-json/tests/testjsondata.pp
@@ -4077,6 +4077,9 @@ begin
   TestFrom('\u00f8','ø'); // this is ø
   TestFrom('\u00f8\"','ø"'); // this is ø"
   TestFrom('\ud83c\udf1f',GlowingStar);
+  TestFrom('\u0041\u0042','AB');   //issue #0038622
+  TestFrom('\u0041\u0042\u0043','ABC');
+  TestFrom('\u0041\u0042\u0043\u0044','ABCD');
 end;
 
 procedure TTestJSONString.TestStringToJSONString;