Changeset 86778 in vbox for trunk/src/VBox/Runtime

Timestamp:

Oct 31, 2020 1:42:13 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141176

Message:

IPRT/rest: bugref:9167 - don't try to deserialize null as if it were
an object. Check for it explicitly and punt. This avoids an
assertion in a debug build. While here add a few more explicit
isNull() checks.

File:

• trunk/src/VBox/Runtime/common/rest/RTCRestStringMapBase.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/rest/RTCRestStringMapBase.cpp

@@ -119 +119 @@
 int RTCRestStringMapBase::deserializeFromJson(RTCRestJsonCursor const &a_rCursor) RT_NOEXCEPT
 {
+    if (RTJsonValueGetType(a_rCursor.m_hValue) == RTJSONVALTYPE_NULL)
+    {
+        setNull();
+        return VINF_SUCCESS;
+    }
+
     /*
      * Make sure the object starts out with an empty map.
@@ -261 +267 @@
 bool RTCRestStringMapBase::containsKey(const char *a_pszKey) const RT_NOEXCEPT
 {
+    if (isNull())
+        return false;
+
     return RTStrSpaceGet((PRTSTRSPACE)&m_Map, a_pszKey) != NULL;
 }
@@ -273 +282 @@
 bool RTCRestStringMapBase::remove(const char *a_pszKey) RT_NOEXCEPT
 {
+    if (isNull())
+        return false;
+
     MapEntry *pRemoved = (MapEntry *)RTStrSpaceRemove(&m_Map, a_pszKey);
     if (pRemoved)
@@ -423 +435 @@
 RTCRestObjectBase *RTCRestStringMapBase::getWorker(const char *a_pszKey) RT_NOEXCEPT
 {
+    if (isNull())
+        return NULL;
+
     MapEntry *pHit = (MapEntry *)RTStrSpaceGet(&m_Map, a_pszKey);
     if (pHit)
@@ -432 +447 @@
 RTCRestObjectBase const *RTCRestStringMapBase::getWorker(const char *a_pszKey) const RT_NOEXCEPT
 {
+    if (isNull())
+        return NULL;
+
     MapEntry const *pHit = (MapEntry const *)RTStrSpaceGet((PRTSTRSPACE)&m_Map, a_pszKey);
     if (pHit)