[c] fix memory leaks: second round

Author: hirishh

modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache

@@ -305,7 +305,7 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create(
     {{/isBoolean}}
     {{/isPrimitiveType}}
     {{/vars}}
-    return {{classname}}_create_internal (
+    {{classname}}_t *result = {{classname}}_create_internal (
         {{#vars}}
         {{#isPrimitiveType}}
         {{#isNumeric}}
@@ -325,6 +325,19 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create(
         {{/isPrimitiveType}}
         {{/vars}}
         );
+    if (!result) {
+        {{#vars}}
+        {{#isPrimitiveType}}
+        {{#isNumeric}}
+        free({{name}}_copy);
+        {{/isNumeric}}
+        {{#isBoolean}}
+        free({{name}}_copy);
+        {{/isBoolean}}
+        {{/isPrimitiveType}}
+        {{/vars}}
+    }
+    return result;
 }
 
 void {{classname}}_free({{classname}}_t *{{classname}}) {
@@ -1091,6 +1104,10 @@ fail:
         {{/vars}}
         );
 
+    if (!{{classname}}_local_var) {
+        goto end;
+    }
+
     return {{classname}}_local_var;
 end:
     {{#vars}}

samples/client/petstore/c-useJsonUnformatted/model/api_response.c

@@ -32,11 +32,15 @@ __attribute__((deprecated)) api_response_t *api_response_create(
         code_copy = malloc(sizeof(int));
         if (code_copy) *code_copy = *code;
     }
-    return api_response_create_internal (
+    api_response_t *result = api_response_create_internal (
         code_copy,
         type,
         message
         );
+    if (!result) {
+        free(code_copy);
+    }
+    return result;
 }
 
 void api_response_free(api_response_t *api_response) {
@@ -153,6 +157,10 @@ api_response_t *api_response_parseFromJSON(cJSON *api_responseJSON){
         message && !cJSON_IsNull(message) ? strdup(message->valuestring) : NULL
         );
 
+    if (!api_response_local_var) {
+        goto end;
+    }
+
     return api_response_local_var;
 end:
     if (code_local_var) {

samples/client/petstore/c-useJsonUnformatted/model/category.c

@@ -29,10 +29,14 @@ __attribute__((deprecated)) category_t *category_create(
         id_copy = malloc(sizeof(long));
         if (id_copy) *id_copy = *id;
     }
-    return category_create_internal (
+    category_t *result = category_create_internal (
         id_copy,
         name
         );
+    if (!result) {
+        free(id_copy);
+    }
+    return result;
 }
 
 void category_free(category_t *category) {
@@ -124,6 +128,10 @@ category_t *category_parseFromJSON(cJSON *categoryJSON){
         name && !cJSON_IsNull(name) ? strdup(name->valuestring) : NULL
         );
 
+    if (!category_local_var) {
+        goto end;
+    }
+
     return category_local_var;
 end:
     if (id_local_var) {

samples/client/petstore/c-useJsonUnformatted/model/mapped_model.c

@@ -29,10 +29,14 @@ __attribute__((deprecated)) MappedModel_t *MappedModel_create(
         another_property_copy = malloc(sizeof(int));
         if (another_property_copy) *another_property_copy = *another_property;
     }
-    return MappedModel_create_internal (
+    MappedModel_t *result = MappedModel_create_internal (
         another_property_copy,
         uuid_property
         );
+    if (!result) {
+        free(another_property_copy);
+    }
+    return result;
 }
 
 void MappedModel_free(MappedModel_t *MappedModel) {
@@ -124,6 +128,10 @@ MappedModel_t *MappedModel_parseFromJSON(cJSON *MappedModelJSON){
         uuid_property && !cJSON_IsNull(uuid_property) ? strdup(uuid_property->valuestring) : NULL
         );
 
+    if (!MappedModel_local_var) {
+        goto end;
+    }
+
     return MappedModel_local_var;
 end:
     if (another_property_local_var) {

samples/client/petstore/c-useJsonUnformatted/model/model_with_set_propertes.c

@@ -24,10 +24,13 @@ __attribute__((deprecated)) model_with_set_propertes_t *model_with_set_propertes
     list_t *tag_set,
     list_t *string_set
     ) {
-    return model_with_set_propertes_create_internal (
+    model_with_set_propertes_t *result = model_with_set_propertes_create_internal (
         tag_set,
         string_set
         );
+    if (!result) {
+    }
+    return result;
 }
 
 void model_with_set_propertes_free(model_with_set_propertes_t *model_with_set_propertes) {
@@ -165,6 +168,10 @@ model_with_set_propertes_t *model_with_set_propertes_parseFromJSON(cJSON *model_
         string_set ? string_setList : NULL
         );
 
+    if (!model_with_set_propertes_local_var) {
+        goto end;
+    }
+
     return model_with_set_propertes_local_var;
 end:
     if (tag_setList) {

samples/client/petstore/c-useJsonUnformatted/model/order.c

@@ -73,14 +73,21 @@ __attribute__((deprecated)) order_t *order_create(
         complete_copy = malloc(sizeof(int));
         if (complete_copy) *complete_copy = *complete;
     }
-    return order_create_internal (
+    order_t *result = order_create_internal (
         id_copy,
         pet_id_copy,
         quantity_copy,
         ship_date,
         status,
         complete_copy
         );
+    if (!result) {
+        free(id_copy);
+        free(pet_id_copy);
+        free(quantity_copy);
+        free(complete_copy);
+    }
+    return result;
 }
 
 void order_free(order_t *order) {
@@ -298,6 +305,10 @@ order_t *order_parseFromJSON(cJSON *orderJSON){
         complete_local_var
         );
 
+    if (!order_local_var) {
+        goto end;
+    }
+
     return order_local_var;
 end:
     if (id_local_var) {

samples/client/petstore/c-useJsonUnformatted/model/pet.c

@@ -58,14 +58,18 @@ __attribute__((deprecated)) pet_t *pet_create(
         id_copy = malloc(sizeof(long));
         if (id_copy) *id_copy = *id;
     }
-    return pet_create_internal (
+    pet_t *result = pet_create_internal (
         id_copy,
         category,
         name,
         photo_urls,
         tags,
         status
         );
+    if (!result) {
+        free(id_copy);
+    }
+    return result;
 }
 
 void pet_free(pet_t *pet) {
@@ -324,6 +328,10 @@ pet_t *pet_parseFromJSON(cJSON *petJSON){
         status ? statusVariable : openapi_petstore_pet_STATUS_NULL
         );
 
+    if (!pet_local_var) {
+        goto end;
+    }
+
     return pet_local_var;
 end:
     if (id_local_var) {

samples/client/petstore/c-useJsonUnformatted/model/tag.c

@@ -29,10 +29,14 @@ __attribute__((deprecated)) tag_t *tag_create(
         id_copy = malloc(sizeof(long));
         if (id_copy) *id_copy = *id;
     }
-    return tag_create_internal (
+    tag_t *result = tag_create_internal (
         id_copy,
         name
         );
+    if (!result) {
+        free(id_copy);
+    }
+    return result;
 }
 
 void tag_free(tag_t *tag) {
@@ -124,6 +128,10 @@ tag_t *tag_parseFromJSON(cJSON *tagJSON){
         name && !cJSON_IsNull(name) ? strdup(name->valuestring) : NULL
         );
 
+    if (!tag_local_var) {
+        goto end;
+    }
+
     return tag_local_var;
 end:
     if (id_local_var) {

samples/client/petstore/c-useJsonUnformatted/model/user.c

@@ -58,7 +58,7 @@ __attribute__((deprecated)) user_t *user_create(
         user_status_copy = malloc(sizeof(int));
         if (user_status_copy) *user_status_copy = *user_status;
     }
-    return user_create_internal (
+    user_t *result = user_create_internal (
         id_copy,
         username,
         first_name,
@@ -70,6 +70,11 @@ __attribute__((deprecated)) user_t *user_create(
         extra,
         preference
         );
+    if (!result) {
+        free(id_copy);
+        free(user_status_copy);
+    }
+    return result;
 }
 
 void user_free(user_t *user) {
@@ -399,6 +404,10 @@ user_t *user_parseFromJSON(cJSON *userJSON){
         preference ? preference_local_nonprim : 0
         );
 
+    if (!user_local_var) {
+        goto end;
+    }
+
     return user_local_var;
 end:
     if (id_local_var) {

samples/client/petstore/c/model/api_response.c

@@ -32,11 +32,15 @@ __attribute__((deprecated)) api_response_t *api_response_create(
         code_copy = malloc(sizeof(int));
         if (code_copy) *code_copy = *code;
     }
-    return api_response_create_internal (
+    api_response_t *result = api_response_create_internal (
         code_copy,
         type,
         message
         );
+    if (!result) {
+        free(code_copy);
+    }
+    return result;
 }
 
 void api_response_free(api_response_t *api_response) {
@@ -153,6 +157,10 @@ api_response_t *api_response_parseFromJSON(cJSON *api_responseJSON){
         message && !cJSON_IsNull(message) ? strdup(message->valuestring) : NULL
         );
 
+    if (!api_response_local_var) {
+        goto end;
+    }
+
     return api_response_local_var;
 end:
     if (code_local_var) {