Changeset 73978 in vbox for trunk/src/VBox/Runtime/common/misc/json.cpp

Timestamp:

Aug 30, 2018 1:19:36 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: Fixed empty array & map handling by making the begin iteration functions return VERR_JSON_IS_EMPTY rather than letter the query method do that. Made query parameter processing table driven and made it use the right escapeing. bugref:9167

File:

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

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

@@ -1518 +1518 @@
     RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_ARRAY);
 
-    return rtJsonIteratorBeginWorker(pThis, phJsonIt);
+    if (pThis->Type.Array.cItems > 0)
+        return rtJsonIteratorBeginWorker(pThis, phJsonIt);
+    return VERR_JSON_IS_EMPTY;
 }
 
@@ -1528 +1530 @@
     RTJSON_TYPECHECK_RETURN(pThis, RTJSONVALTYPE_OBJECT);
 
-    return rtJsonIteratorBeginWorker(pThis, phJsonIt);
+    if (pThis->Type.Object.cMembers > 0)
+        return rtJsonIteratorBeginWorker(pThis, phJsonIt);
+    return VERR_JSON_IS_EMPTY;
 }