Fix JSON output with empty arrays or objects.

Author: michaelrsweet

CHANGES.md

@@ -17,6 +17,7 @@ libcups v3.0.0 (YYYY-MM-DD)
 - Updated the `httpSetCookie` API to support multiple "Set-Cookie:" header
   values.
 - Updated `ippfind` to use the `cupsGetClock` API.
+- Fixed `cupsJSONExport` functions with empty arrays or objects.
 - Fixed `httpGetDateTime` for dates in the far future (Issue #124)
 - Fixed input checks for `cupsCreateCredentials` and
   `cupsCreateCredentialsRequest` APIs (Issue #125)

cups/json.c

@@ -428,32 +428,39 @@ cupsJSONExportString(cups_json_t *json)	// I - JSON root node
       // Descend
       current = current->value.child;
     }
-    else if (current->sibling)
-    {
-      // Visit silbling
-      current = current->sibling;
-    }
-    else if ((current = current->parent) != NULL)
+    else
     {
-      // Ascend and continue...
+      // Close out current array/object...
       if (current->type == CUPS_JTYPE_ARRAY)
         *ptr++ = ']';
-      else
+      else if (current->type == CUPS_JTYPE_OBJECT)
         *ptr++ = '}';
 
-      while (current)
+      if (current->sibling)
       {
-        if (current->sibling)
-	{
-	  current = current->sibling;
-	  break;
-	}
-	else if ((current = current->parent) != NULL)
+	// Visit silbling
+	current = current->sibling;
+      }
+      else if ((current = current->parent) != NULL)
+      {
+	// Ascend and continue...
+	while (current)
 	{
+	  // Close out current array/object...
 	  if (current->type == CUPS_JTYPE_ARRAY)
 	    *ptr++ = ']';
-	  else
+	  else if (current->type == CUPS_JTYPE_OBJECT)
 	    *ptr++ = '}';
+
+	  if (current->sibling)
+	  {
+	    current = current->sibling;
+	    break;
+	  }
+	  else
+	  {
+	    current = current->parent;
+	  }
 	}
       }
     }

cups/testjson.c

@@ -10,6 +10,7 @@
 #include "cups.h"
 #include "json.h"
 #include "test-internal.h"
+#include <math.h>
 
 
 //
@@ -33,6 +34,7 @@ main(int  argc,				// I - Number of command-line arguments
     size_t	count;			// Number of children
     char	*s;			// JSON string
     time_t	last_modified = 0;	// Last-Modified value
+    double	number;			// Number value
     static const char * const types[] =	// Node types
     {
       "CUPS_JTYPE_NULL",		// Null value
@@ -177,9 +179,29 @@ main(int  argc,				// I - Number of command-line arguments
     current = cupsJSONNewNumber(parent, current, 2);
     testEnd(current != NULL);
 
+    testBegin("cupsJSONNewKey('emptyArray')");
+    current = cupsJSONNewKey(json, NULL, "emptyArray");
+    testEnd(current != NULL);
+
+    testBegin("cupsJSONNew(array)");
+    parent = cupsJSONNew(json, current, CUPS_JTYPE_ARRAY);
+    testEnd(parent != NULL);
+
+    testBegin("cupsJSONNewKey('emptyObject')");
+    current = cupsJSONNewKey(json, NULL, "emptyObject");
+    testEnd(current != NULL);
+
+    testBegin("cupsJSONNew(object)");
+    parent = cupsJSONNew(json, current, CUPS_JTYPE_OBJECT);
+    testEnd(parent != NULL);
+
     testBegin("cupsJSONGetCount(root)");
     count = cupsJSONGetCount(json);
-    testEndMessage(count == 14, "%u", (unsigned)count);
+    testEndMessage(count == 18, "%u", (unsigned)count);
+
+    testBegin("cupsJSONFind('number')");
+    number = cupsJSONGetNumber(cupsJSONFind(json, "number"));
+    testEndMessage(fabs(number-42.0) < 0.01, "%g", number);
 
     testBegin("cupsJSONExportFile(root, 'test.json')");
     if (cupsJSONExportFile(json, "test.json"))
@@ -206,6 +228,10 @@ main(int  argc,				// I - Number of command-line arguments
       parent = cupsJSONImportString(s);
       testEnd(parent != NULL);
 
+      testBegin("cupsJSONGetCount(imported)");
+      count = cupsJSONGetCount(parent);
+      testEndMessage(count == 18, "%u", (unsigned)count);
+
       cupsJSONDelete(parent);
       free(s);
     }
@@ -224,8 +250,16 @@ main(int  argc,				// I - Number of command-line arguments
     if (json)
     {
       char	last_modified_date[256];// Last-Modified string value
+      const char *jwks_uri;		// jwks_uri value
 
       testEnd(true);
+
+      testBegin("cupsJSONFind('jwks_uri')");
+      if ((jwks_uri = cupsJSONGetString(cupsJSONFind(json, "jwks_uri"))) != NULL)
+        testEndMessage(true, "%s", jwks_uri);
+      else
+        testEnd(false);
+
       cupsJSONDelete(json);
 
       testBegin("cupsJSONImportURL('https://accounts.google.com/.well-known/openid-configuration', since %s)", httpGetDateString(last_modified, last_modified_date, sizeof(last_modified_date)));