Fix Json allowing permissive parsing.

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / internal / builder / json-parser-state.cpp

diff --git a/optional/dali-toolkit/internal/builder/json-parser-state.cpp b/optional/dali-toolkit/internal/builder/json-parser-state.cpp
index 9b6fa4f..46c7550 100644 (file)
--- a/optional/dali-toolkit/internal/builder/json-parser-state.cpp
+++ b/optional/dali-toolkit/internal/builder/json-parser-state.cpp
@@ -722,6 +722,11 @@ bool JsonParserState::ParseJson(VectorChar& source)
       {
         if( '}' == currentChar )
         {
+          if(',' == lastCharacter)
+          {
+            return Error("Unexpected comma");
+          }
+
           if( !UpToParent() )
           {
             return false;
@@ -799,15 +804,22 @@ bool JsonParserState::ParseJson(VectorChar& source)
         }
         else if( '{' == currentChar )
         {
-          NewNode(name, TreeNode::OBJECT);
-          mState = STATE_OBJECT;
-          AdvanceSkipWhiteSpace(1);
+          if( '}' == lastCharacter )
+          {
+            return Error("Expected a comma");
+          }
+          else
+          {
+            NewNode(name, TreeNode::OBJECT);
+            mState = STATE_OBJECT;
+            AdvanceSkipWhiteSpace(1);
+          }
         }
         else if( '}' == currentChar )
         {
           if(',' == lastCharacter)
           {
-            return Error("Expected a value");
+            return Error("Expected another value");
           }
 
           if(mCurrent.GetType() != TreeNode::OBJECT)