From 5be2dfd9c8b8a6d0a84312bde2d2d21cc6177c3b Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 17 Sep 2016 08:18:53 +0000
Subject: [PATCH] * Fix bug ID #30606, identifier not allowed when parsing
 object

git-svn-id: trunk@34536 -
---
 packages/fcl-json/src/jsonparser.pp       |  1 +
 packages/fcl-json/tests/testjsonparser.pp | 24 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/fcl-json/src/jsonparser.pp b/packages/fcl-json/src/jsonparser.pp
index 5d9df0cf98..987aba364f 100644
--- a/packages/fcl-json/src/jsonparser.pp
+++ b/packages/fcl-json/src/jsonparser.pp
@@ -148,6 +148,7 @@ begin
       tkSQuaredBraceClose : DoError(SErrUnexpectedToken);
       tkNumber : Result:=ParseNumber;
       tkComma : DoError(SErrUnexpectedToken);
+      tkIdentifier : DoError(SErrUnexpectedToken);
     end;
   except
     FreeAndNil(Result);
diff --git a/packages/fcl-json/tests/testjsonparser.pp b/packages/fcl-json/tests/testjsonparser.pp
index 602cb1e515..120ad60493 100644
--- a/packages/fcl-json/tests/testjsonparser.pp
+++ b/packages/fcl-json/tests/testjsonparser.pp
@@ -22,6 +22,9 @@ uses
   Classes, SysUtils, fpcunit, testutils, testregistry,fpjson,
   jsonscanner,jsonParser,testjsondata;
 
+Const
+  DefaultOpts = [joUTF8,joStrict];
+
 type
 
   { TTestParser }
@@ -30,7 +33,7 @@ type
   private
     FOptions : TJSONOptions;
     procedure CallNoHandlerStream;
-    procedure DoTestError(S: String);
+    procedure DoTestError(S: String; Options : TJSONOptions = DefaultOpts);
     procedure DoTestFloat(F: TJSONFloat); overload;
     procedure DoTestFloat(F: TJSONFloat; S: String); overload;
     procedure DoTestObject(S: String; const ElNames: array of String; DoJSONTest : Boolean = True);
@@ -53,6 +56,7 @@ type
     procedure TestString;
     procedure TestArray;
     procedure TestObject;
+    procedure TestObjectError;
     procedure TestTrailingComma;
     procedure TestTrailingCommaErrorArray;
     procedure TestTrailingCommaErrorObject;
@@ -326,6 +330,12 @@ begin
   DoTestObject('{ "a" : 1, "B" : { "c" : "d" } }',['a','B']);
 end;
 
+procedure TTestParser.TestObjectError;
+begin
+
+  DoTestError('{ "name" : value }',[joUTF8]);
+end;
+
 
 procedure TTestParser.DoTestObject(S: String; const ElNames: array of String;
   DoJSONTest: Boolean);
@@ -406,21 +416,21 @@ end;
 procedure TTestParser.TestErrors;
 
 begin
-{
+
   DoTestError('a');
   DoTestError('"b');
   DoTestError('1Tru');
-}
+
   DoTestError('b"');
   DoTestError('{"a" : }');
   DoTestError('{"a" : ""');
   DoTestError('{"a : ""');
-{
+
   DoTestError('[1,]');
   DoTestError('[,]');
   DoTestError('[,,]');
   DoTestError('[1,,]');
-}
+
 end;
 
 procedure TTestParser.TestClasses;
@@ -516,7 +526,7 @@ begin
   end;
 end;
 
-procedure TTestParser.DoTestError(S : String);
+procedure TTestParser.DoTestError(S : String; Options : TJSONOptions = DefaultOpts);
 
 Var
   P : TJSONParser;
@@ -527,7 +537,7 @@ Var
 begin
   ParseOK:=False;
   P:=TJSONParser.Create(S);
-  P.Strict:=True;
+  P.OPtions:=Options;
   J:=Nil;
   Try
     Try