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

Timestamp:

Aug 31, 2018 10:39:08 AM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: fixes. bugref:9167

Location:

trunk/src/VBox/Runtime/common/rest

Files:

• RTCRestArrayBase.cpp (modified) (4 diffs)
• RTCRestClientResponseBase.cpp (modified) (1 diff)
• RTCRestStringMapBase.cpp (modified) (1 diff)

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

@@ -179 +179 @@
         RTJsonIteratorFree(hIterator);
     }
-    else if (rcRet == VERR_JSON_IS_EMPTY)
+    else if (   rcRet == VERR_JSON_IS_EMPTY
+             || (   rcRet == VERR_JSON_VALUE_INVALID_TYPE
+                 && RTJsonValueGetType(a_rCursor.m_hValue) == RTJSONVALTYPE_NULL) )
         rcRet = VINF_SUCCESS;
     else
-        rcRet = a_rCursor.m_pPrimary->addError(a_rCursor, rcRet, "RTJsonIteratorBeginArray failed: %Rrc", rcRet);
+        rcRet = a_rCursor.m_pPrimary->addError(a_rCursor, rcRet,
+                                               "RTJsonIteratorBeginrray failed: %Rrc (type %s)",
+                                               rcRet, RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
     return rcRet;
 
@@ -272 +276 @@
         {
             m_papElements = (RTCRestObjectBase **)pvNew;
-            memset(m_papElements, 0, (a_cEnsureCapacity - m_cCapacity) * sizeof(sizeof(m_papElements[0])));
+            memset(&m_papElements[m_cCapacity], 0, (a_cEnsureCapacity - m_cCapacity) * sizeof(sizeof(m_papElements[0])));
             m_cCapacity   = a_cEnsureCapacity;
         }
@@ -295 +299 @@
             for (size_t i = 0; i < a_rThat.m_cElements; i++)
             {
+                AssertPtr(a_rThat.m_papElements[i]);
                 rc = insertCopyWorker(i, *a_rThat.m_papElements[i], false);
                 if (RT_SUCCESS(rc))
@@ -337 +342 @@
             m_papElements[a_idx] = a_pValue;
             m_cElements++;
+#ifdef RT_STRICT
+            for (size_t i = 0; i < m_cElements; i++)
+                AssertPtr(m_papElements[i]);
+#endif
             return VINF_SUCCESS;
         }

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

@@ -65 +65 @@
     , m_strContentType(a_rThat.m_strContentType)
 {
-    if (m_pErrInfo)
-        copyErrInfo(m_pErrInfo);
+    if (a_rThat.m_pErrInfo)
+        copyErrInfo(a_rThat.m_pErrInfo);
 }
 

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

@@ -175 +175 @@
         RTJsonIteratorFree(hIterator);
     }
-    else if (rcRet == VERR_JSON_IS_EMPTY)
+    else if (   rcRet == VERR_JSON_IS_EMPTY
+             || (   rcRet == VERR_JSON_VALUE_INVALID_TYPE
+                 && RTJsonValueGetType(a_rCursor.m_hValue) == RTJSONVALTYPE_NULL) )
         rcRet = VINF_SUCCESS;
     else
-        rcRet = a_rCursor.m_pPrimary->addError(a_rCursor, rcRet, "RTJsonIteratorBegin failed: %Rrc", rcRet);
+        rcRet = a_rCursor.m_pPrimary->addError(a_rCursor, rcRet, "RTJsonIteratorBegin failed: %Rrc (type %s)",
+                                               rcRet, RTJsonValueTypeName(RTJsonValueGetType(a_rCursor.m_hValue)));
     return rcRet;
 }