Changeset 61721 in vbox for trunk/src/VBox/Runtime/common/misc/json.cpp

Timestamp:

Jun 15, 2016 2:26:43 PM (9 years ago)

Author:

vboxsync

Message:

Runtime/RTJson: Fixes, updates to the testcase

File:

• trunk/src/VBox/Runtime/common/misc/json.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/misc/json.cpp

@@ -877 +877 @@
 
         /* Skip value separator and continue with next token. */
-        if (rtJsonTokenizerConsumeIfMatched(pTokenizer, RTJSONTOKENCLASS_VALUE_SEPARATOR))
-            rc = rtJsonTokenizerGetToken(pTokenizer, &pToken);
-        else
+        bool fSkippedSep = rtJsonTokenizerConsumeIfMatched(pTokenizer, RTJSONTOKENCLASS_VALUE_SEPARATOR);
+        rc = rtJsonTokenizerGetToken(pTokenizer, &pToken);
+
+        if (   RT_SUCCESS(rc)
+            && !fSkippedSep
+            && pToken->enmClass != RTJSONTOKENCLASS_END_ARRAY)
             rc = VERR_JSON_MALFORMED;
     }
@@ -947 +950 @@
                         break;
                     }
+
+                    papValues = papValuesNew;
+                    papszNames = papszNamesNew;
                 }
 
-                Assert(cMembers < cMembers);
+                Assert(cMembers < cMembersMax);
                 papszNames[cMembers] = pszName;
                 papValues[cMembers] = pVal;
                 cMembers++;
 
-                /* Next token. */
+                /* Skip value separator and continue with next token. */
+                bool fSkippedSep = rtJsonTokenizerConsumeIfMatched(pTokenizer, RTJSONTOKENCLASS_VALUE_SEPARATOR);
                 rc = rtJsonTokenizerGetToken(pTokenizer, &pToken);
+
+                if (   RT_SUCCESS(rc)
+                    && !fSkippedSep
+                    && pToken->enmClass != RTJSONTOKENCLASS_END_OBJECT)
+                    rc = VERR_JSON_MALFORMED;
             }
         }