Changeset 77700 in vbox

Timestamp:

Mar 14, 2019 12:41:50 AM (6 years ago)

Author:

vboxsync

Message:

Runtime/json: Plug small memory leak when parsing a JSON file fails

File:

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

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

@@ -934 +934 @@
 
 /**
+ * Cleans up any resources still in control of the given token.
+ *
+ * @returns nothing.
+ * @param   pToken              The toke nto clean up.
+ */
+static void rtJsonTokenizerTokenCleanup(PRTJSONTOKEN pToken)
+{
+    if (   pToken->enmClass == RTJSONTOKENCLASS_STRING
+        && pToken->Class.String.pszStr)
+        RTStrFree(pToken->Class.String.pszStr);
+}
+
+/**
  * Destroys a given tokenizer state.
  *
@@ -941 +954 @@
 static void rtJsonTokenizerDestroy(PRTJSONTOKENIZER pTokenizer)
 {
-    RT_NOREF_PV(pTokenizer);
+    rtJsonTokenizerTokenCleanup(pTokenizer->pTokenCurr);
+    rtJsonTokenizerTokenCleanup(pTokenizer->pTokenNext);
 }
 
@@ -1156 +1170 @@
     {
         char *pszName = pToken->Class.String.pszStr; /* We can consume this string as it was allocated. */
+        pToken->Class.String.pszStr = NULL;
 
         rtJsonTokenizerConsume(pTokenizer);
@@ -1177 +1192 @@
                         if (papszNamesNew)
                             RTMemFree(papszNamesNew);
+                        RTStrFree(pszName);
                         rc = VERR_NO_MEMORY;
                         break;
@@ -1200 +1216 @@
                                        pTokenizer->Pos.iLine, pTokenizer->Pos.iChStart);
             }
+            else
+                RTStrFree(pszName);
         }
         else
+        {
+            RTStrFree(pszName);
             rc = RTErrInfoSetF(pTokenizer->pErrInfo, VERR_JSON_MALFORMED, "expected name separator (line %zu col %zu)",
                                pTokenizer->Pos.iLine, pTokenizer->Pos.iChStart);
+        }
     }