Some improvements

Signed-off-by: Sourav Moitra <sourav.moitr@gmail.com>
containers · Nov 29, 2024 · 443dc33 · 443dc33
1 parent 3f784ca
commit 443dc33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/ocispec/json_common.c b/src/ocispec/json_common.c
@@ -634,7 +634,7 @@ make_json_map_string_string (json_t *src, const struct parser_context *ctx,
       return NULL;
     }
 
-  ret->len = 0;
+  ret->len = len;
 
   ret->keys = calloc (len + 1, sizeof (char *));
   if (ret->keys == NULL)
@@ -685,6 +685,10 @@ make_json_map_string_string (json_t *src, const struct parser_context *ctx,
 
     i++;
   }
+  if (i == 0) {
+    return NULL;
+  }
+
   return move_ptr (ret);
 }
 

diff --git a/src/ocispec/sources.py b/src/ocispec/sources.py
@@ -366,18 +366,12 @@ def get_obj_arr_obj_array(obj, c_file, prefix):
             typename = obj.subtypname
         else:
             typename = helpers.get_name_substr(obj.name, prefix)
-
-        if obj.doublearray:
-            root_type = "array"
-        else:
-            root_type = "object"
-
         c_file.append(f'    if (ptr != NULL && ptr->{obj.fixname} != NULL)\n')
         c_file.append('      {\n')
         c_file.append('        size_t len = 0, i;\n')
         c_file.append(f"        if (ptr != NULL && ptr->{obj.fixname} != NULL)\n")
         c_file.append(f"            len = ptr->{obj.fixname}_len;//{obj.subtypobj}\n")
-        c_file.append(f'        json_t *subroot = json_{root_type}();//lalala\n')
+        c_file.append(f'        json_t *subroot = json_array();//lalala\n')
         c_file.append('        for (i = 0; i < len; i++)\n')
         c_file.append('          {\n')
         if obj.doublearray: