Changeset 74008 in vbox for trunk/src/VBox/Runtime/common/rest/RTCRestArrayBase.cpp

Timestamp:

Aug 31, 2018 7:08:02 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: Deal (more) properly with 'null'. bugref:9167

File:

• trunk/src/VBox/Runtime/common/rest/RTCRestArrayBase.cpp (modified) (9 diffs)

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

@@ -88 +88 @@
     /* The default state of an array is empty. At least for now. */
     clear();
+    m_fNullIndicator = false;
     return VINF_SUCCESS;
 }
@@ -94 +95 @@
 RTCRestOutputBase &RTCRestArrayBase::serializeAsJson(RTCRestOutputBase &a_rDst) const
 {
-    a_rDst.printf("[\n");
-    unsigned const uOldIndent = a_rDst.incrementIndent();
-
-    for (size_t i = 0; i < m_cElements; i++)
-    {
-        m_papElements[i]->serializeAsJson(a_rDst);
-        if (i < m_cElements)
-            a_rDst.printf(",\n");
-        else
-            a_rDst.printf("\n");
-    }
-
-    a_rDst.setIndent(uOldIndent);
-    a_rDst.printf("]");
+    if (!m_fNullIndicator)
+    {
+        a_rDst.printf("[\n");
+        unsigned const uOldIndent = a_rDst.incrementIndent();
+
+        for (size_t i = 0; i < m_cElements; i++)
+        {
+            m_papElements[i]->serializeAsJson(a_rDst);
+            if (i < m_cElements)
+                a_rDst.printf(",\n");
+            else
+                a_rDst.printf("\n");
+        }
+
+        a_rDst.setIndent(uOldIndent);
+        a_rDst.printf("]");
+    }
+    else
+        a_rDst.printf("null");
     return a_rDst;
 }
@@ -119 +125 @@
     if (m_cElements > 0)
         clear();
+    m_fNullIndicator = false;
 
     /*
@@ -179 +186 @@
         RTJsonIteratorFree(hIterator);
     }
-    else if (   rcRet == VERR_JSON_IS_EMPTY
-             || (   rcRet == VERR_JSON_VALUE_INVALID_TYPE
-                 && RTJsonValueGetType(a_rCursor.m_hValue) == RTJSONVALTYPE_NULL) )
+    else if (rcRet == VERR_JSON_IS_EMPTY)
         rcRet = VINF_SUCCESS;
+    else if (   rcRet == VERR_JSON_VALUE_INVALID_TYPE
+             && RTJsonValueGetType(a_rCursor.m_hValue) == RTJSONVALTYPE_NULL)
+    {
+        m_fNullIndicator = true;
+        rcRet = VINF_SUCCESS;
+    }
     else
         rcRet = a_rCursor.m_pPrimary->addError(a_rCursor, rcRet,
@@ -195 +206 @@
 {
     int rc;
-    if (m_cElements)
-    {
-        static char const s_szSep[kCollectionFormat_Mask + 1] = ",, \t|,,";
-        char const chSep = s_szSep[a_fFlags & kCollectionFormat_Mask];
-
-        rc = m_papElements[0]->toString(a_pDst, a_fFlags);
-        for (size_t i = 1; RT_SUCCESS(rc) && i < m_cElements; i++)
-        {
-            rc = a_pDst->appendNoThrow(chSep);
-            if (RT_SUCCESS(rc))
-                rc = m_papElements[i]->toString(a_pDst, a_fFlags | kToString_Append);
-        }
-    }
+    if (!m_fNullIndicator)
+    {
+        if (m_cElements)
+        {
+            static char const s_szSep[kCollectionFormat_Mask + 1] = ",, \t|,,";
+            char const chSep = s_szSep[a_fFlags & kCollectionFormat_Mask];
+
+            rc = m_papElements[0]->toString(a_pDst, a_fFlags);
+            for (size_t i = 1; RT_SUCCESS(rc) && i < m_cElements; i++)
+            {
+                rc = a_pDst->appendNoThrow(chSep);
+                if (RT_SUCCESS(rc))
+                    rc = m_papElements[i]->toString(a_pDst, a_fFlags | kToString_Append);
+            }
+        }
+        else
+        {
+            if (!(a_fFlags & kToString_Append))
+                a_pDst->setNull();
+            rc = VINF_SUCCESS;
+        }
+    }
+    else if (a_fFlags & kToString_Append)
+        rc = a_pDst->appendNoThrow(RT_STR_TUPLE("null"));
     else
-    {
-        a_pDst->setNull();
-        rc = VINF_SUCCESS;
-    }
+        rc = a_pDst->appendNoThrow(RT_STR_TUPLE("null"));
+
     return rc;
 }
@@ -239 +259 @@
     }
     m_cElements = 0;
+    m_fNullIndicator = false;
 }
 
@@ -291 +312 @@
     clear();
     if (a_rThat.m_cElements == 0)
+    {
+        m_fNullIndicator = a_rThat.m_fNullIndicator;
         rc = VINF_SUCCESS;
+    }
     else
     {
+        Assert(!a_rThat.m_fNullIndicator);
         rc = ensureCapacity(a_rThat.m_cElements);
         if (RT_SUCCESS(rc))
@@ -346 +371 @@
                 AssertPtr(m_papElements[i]);
 #endif
+            m_fNullIndicator = false;
             return VINF_SUCCESS;
         }
@@ -352 +378 @@
         delete m_papElements[a_idx];
         m_papElements[a_idx] = a_pValue;
+        m_fNullIndicator = false;
         return VWRN_ALREADY_EXISTS;
     }