update after incorporating autogen; fix memory leaks in new test

Author: DenverM80

src/ds3.c

@@ -13234,8 +13234,8 @@ static ds3_error* _parse_top_level_ds3_list_bucket_result_response(const ds3_cli
     xmlNodePtr child_node;
     ds3_list_bucket_result_response* response;
     ds3_error* error = NULL;
-    GPtrArray* objects_array = g_ptr_array_new();
     GPtrArray* common_prefixes_array = g_ptr_array_new();
+    GPtrArray* objects_array = g_ptr_array_new();
 
     error = _get_request_xml_nodes(xml_blob, &doc, &root, "ListBucketResult");
     if (error != NULL) {
@@ -13283,13 +13283,12 @@ static ds3_error* _parse_top_level_ds3_list_bucket_result_response(const ds3_cli
 
     }
 
-    response->objects = (ds3_contents_response**)objects_array->pdata;
-    response->num_objects = objects_array->len;
-    g_ptr_array_free(objects_array, FALSE);
-
     response->common_prefixes = (ds3_str**)common_prefixes_array->pdata;
     response->num_common_prefixes = common_prefixes_array->len;
     g_ptr_array_free(common_prefixes_array, FALSE);
+    response->objects = (ds3_contents_response**)objects_array->pdata;
+    response->num_objects = objects_array->len;
+    g_ptr_array_free(objects_array, FALSE);
 
     xmlFreeDoc(doc);
 
@@ -13307,6 +13306,7 @@ static ds3_error* _parse_top_level_ds3_list_multi_part_uploads_result_response(c
     xmlNodePtr child_node;
     ds3_list_multi_part_uploads_result_response* response;
     ds3_error* error = NULL;
+    GPtrArray* common_prefixes_array = g_ptr_array_new();
     GPtrArray* uploads_array = g_ptr_array_new();
 
     error = _get_request_xml_nodes(xml_blob, &doc, &root, "ListMultipartUploadsResult");
@@ -13321,15 +13321,11 @@ static ds3_error* _parse_top_level_ds3_list_multi_part_uploads_result_response(c
             response->bucket = xml_get_string(doc, child_node);
         } else if (element_equal(child_node, "CommonPrefixes")) {
             xmlNodePtr loop_node;
-            GPtrArray* common_prefixes_array = g_ptr_array_new();
             int num_nodes = 0;
             for (loop_node = child_node->xmlChildrenNode; loop_node != NULL; loop_node = loop_node->next, num_nodes++) {
                 ds3_str* common_prefixes = xml_get_string(doc, loop_node);
                 g_ptr_array_add(common_prefixes_array, common_prefixes);
             }
-            response->common_prefixes = (ds3_str**)common_prefixes_array->pdata;
-            response->num_common_prefixes = common_prefixes_array->len;
-            g_ptr_array_free(common_prefixes_array, FALSE);
         } else if (element_equal(child_node, "Delimiter")) {
             response->delimiter = xml_get_string(doc, child_node);
         } else if (element_equal(child_node, "KeyMarker")) {
@@ -13361,6 +13357,9 @@ static ds3_error* _parse_top_level_ds3_list_multi_part_uploads_result_response(c
 
     }
 
+    response->common_prefixes = (ds3_str**)common_prefixes_array->pdata;
+    response->num_common_prefixes = common_prefixes_array->len;
+    g_ptr_array_free(common_prefixes_array, FALSE);
     response->uploads = (ds3_multi_part_upload_response**)uploads_array->pdata;
     response->num_uploads = uploads_array->len;
     g_ptr_array_free(uploads_array, FALSE);

test/test.cpp

@@ -201,7 +201,7 @@ void populate_with_objects(const ds3_client* client, const char* bucket_name) {
 }
 
 void populate_with_multi_dir_objects(const ds3_client* client, const char* bucket_name) {
-    ds3_str* job_id = populate_with_object_list_return_job(client, bucket_name, multi_dirs_object_list());
+    ds3_str* job_id = populate_with_multi_dir_objects_return_job(client, bucket_name);
     ds3_str_free(job_id);
 }
 
@@ -319,7 +319,17 @@ ds3_str* populate_with_object_list_return_job( const ds3_client* client,
 }
 
 ds3_str* populate_with_objects_return_job(const ds3_client* client, const char* bucket_name) {
-    return populate_with_object_list_return_job(client, bucket_name, default_object_list());
+    ds3_bulk_object_list_response* obj_list = default_object_list();
+    ds3_str* job_id = populate_with_object_list_return_job(client, bucket_name, obj_list);
+    ds3_bulk_object_list_response_free(obj_list);
+    return job_id;
+}
+
+ds3_str* populate_with_multi_dir_objects_return_job(const ds3_client* client, const char* bucket_name) {
+    ds3_bulk_object_list_response* obj_list = multi_dirs_object_list();
+    ds3_str* job_id = populate_with_object_list_return_job(client, bucket_name, obj_list);
+    ds3_bulk_object_list_response_free(obj_list);
+    return job_id;
 }
 
 bool contains_object(ds3_list_bucket_result_response* bucket_list, const char* key) {

test/test.h

@@ -26,10 +26,13 @@ void clear_bucket(const ds3_client* client, const char* bucket_name);
 
 void populate_with_objects(const ds3_client* client, const char* bucket_name);
 void populate_with_multi_dir_objects(const ds3_client* client, const char* bucket_name);
+
 ds3_str* populate_with_object_list_return_job( const ds3_client* client,
                                                const char* bucket_name,
                                                ds3_bulk_object_list_response* object_list);
+
 ds3_str* populate_with_objects_return_job(const ds3_client* client, const char* bucket_name);
+ds3_str* populate_with_multi_dir_objects_return_job(const ds3_client* client, const char* bucket_name);
 ds3_str* populate_with_empty_objects(const ds3_client* client, const char* bucket_name);
 
 ds3_request* populate_bulk_return_request(const ds3_client* client, const char* bucket_name, ds3_bulk_object_list_response* obj_list);