* Merging revisions 47342 from trunk:

    ------------------------------------------------------------------------
    r47342 | michael | 2020-11-08 17:42:06 +0100 (Sun, 08 Nov 2020) | 1 line
    
    * Fail with trailing garbage in joStrict mode, bug ID #0037837
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@49319 -

packages/fcl-json/src/jsonreader.pp

@@ -179,7 +179,8 @@ Resourcestring
   SErrInvalidNumber          = 'Number is not an integer or real number: %s';
   SErrNoScanner = 'No scanner. No source specified ?';
   SErrorAt = 'Error at line %d, Pos %d: ';
-  
+  SErrGarbageFound = 'Expected EOF, but got %s';
+
 { TBaseJSONReader }
 
 
@@ -189,6 +190,14 @@ begin
   if (FScanner=Nil) then
     DoError(SErrNoScanner);
   DoParse(False,True);
+  if joStrict in Options then
+    begin
+    Repeat
+       GetNextToken;
+    Until CurrentToken<>tkWhiteSpace;
+    If CurrentToken<>tkEOF then
+      DoError(Format(SErrGarbageFound,[CurrentTokenString]));
+   end;
 end;
 
 {

packages/fcl-json/tests/testjsonreader.pp

@@ -75,6 +75,8 @@ type
     procedure TestMixed;
     Procedure TestComment;
     procedure TestErrors;
+    procedure TestGarbageOK;
+    procedure TestGarbageFail;
   end;
 
   TTestReader = Class(TBaseTestReader)
@@ -450,6 +452,18 @@ begin
 
 end;
 
+procedure TBaseTestReader.TestGarbageOK;
+begin
+  TestRead('"a"sss',['string:a']);
+  TestRead('[null]xxx',['sa','null','ea']);
+end;
+
+procedure TBaseTestReader.TestGarbageFail;
+begin
+  DoTestError('"a"sss',[joStrict]);
+  DoTestError('[null]aaa',[joStrict]);
+end;
+
 
 procedure TBaseTestReader.CallNoHandlerStream;