Changeset 72955 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Jul 7, 2018 7:06:09 PM (7 years ago)

Author:

vboxsync

Message:

Runtime/RTJson: Some error checking addendums to r123506 (bugref:9188)

File:

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

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

@@ -167 +167 @@
     /** The next token in the input stream (used for peeking). */
     PRTJSONTOKEN            pTokenNext;
+    /** The tokenizer error state. */
+    int                     rcTok;
 } RTJSONTOKENIZER;
 /** Pointer to a JSON tokenizer. */
@@ -705 +707 @@
     }
 
+    if (RT_FAILURE(rc))
+        pTokenizer->rcTok = rc;
+
     return rc;
 }
@@ -728 +733 @@
     pTokenizer->pTokenCurr   = &pTokenizer->Token1;
     pTokenizer->pTokenNext   = &pTokenizer->Token2;
+    pTokenizer->rcTok        = VINF_SUCCESS;
 
     RT_ZERO(pTokenizer->achBuf);
@@ -763 +769 @@
 DECLINLINE(int) rtJsonTokenizerGetToken(PRTJSONTOKENIZER pTokenizer, PRTJSONTOKEN *ppToken)
 {
-    *ppToken = pTokenizer->pTokenCurr;
-    return VINF_SUCCESS;
+    if (RT_SUCCESS(pTokenizer->rcTok))
+    {
+        *ppToken = pTokenizer->pTokenCurr;
+        return VINF_SUCCESS;
+    }
+
+    return pTokenizer->rcTok;
 }
 
@@ -795 +806 @@
     PRTJSONTOKEN pToken = NULL;
     int rc = rtJsonTokenizerGetToken(pTokenizer, &pToken);
-    AssertRC(rc);
-
-    if (pToken->enmClass == enmClass)
-    {
-        rtJsonTokenizerConsume(pTokenizer);
-        return true;
+    if (RT_SUCCESS(rc))
+    {
+        if (pToken->enmClass == enmClass)
+        {
+            rtJsonTokenizerConsume(pTokenizer);
+            return true;
+        }
     }
 
@@ -958 +970 @@
            && pToken->enmClass == RTJSONTOKENCLASS_STRING)
     {
-        char *pszName = pToken->Class.String.pszStr;
+        char *pszName = pToken->Class.String.pszStr; /* We can consume this string as it was allocated. */
 
         rtJsonTokenizerConsume(pTokenizer);