[c] fix memory leaks

Author: hirishh

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

@@ -202,45 +202,10 @@ static {{classname}}_t *{{classname}}_create_internal(
         return NULL;
     }
     memset({{classname}}_local_var, 0, sizeof({{classname}}_t));
+    {{classname}}_local_var->_library_owned = 1;
     {{#vars}}
-    {{^isContainer}}
-    {{#isPrimitiveType}}
-    {{#isNumeric}}
-    if ({{{name}}}) {
-        {{classname}}_local_var->{{{name}}} = malloc(sizeof({{datatype}}));
-        if (!{{classname}}_local_var->{{{name}}}) {
-            {{classname}}_free({{classname}}_local_var);
-            return NULL;
-        }
-        *{{classname}}_local_var->{{{name}}} = *{{{name}}};
-    }
-    {{/isNumeric}}
-    {{#isBoolean}}
-    if ({{{name}}}) {
-        {{classname}}_local_var->{{{name}}} = malloc(sizeof({{datatype}}));
-        if (!{{classname}}_local_var->{{{name}}}) {
-            {{classname}}_free({{classname}}_local_var);
-            return NULL;
-        }
-        *{{classname}}_local_var->{{{name}}} = *{{{name}}};
-    }
-    {{/isBoolean}}
-    {{^isNumeric}}
-    {{^isBoolean}}
-    {{classname}}_local_var->{{{name}}} = {{{name}}};
-    {{/isBoolean}}
-    {{/isNumeric}}
-    {{/isPrimitiveType}}
-    {{^isPrimitiveType}}
     {{classname}}_local_var->{{{name}}} = {{{name}}};
-    {{/isPrimitiveType}}
-    {{/isContainer}}
-    {{#isContainer}}
-    {{classname}}_local_var->{{{name}}} = {{{name}}};
-    {{/isContainer}}
     {{/vars}}
-
-    {{classname}}_local_var->_library_owned = 1;
     return {{classname}}_local_var;
 }
 
@@ -322,9 +287,42 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create(
     {{/isContainer}}
     {{/vars}}
     ) {
+    {{#vars}}
+    {{#isPrimitiveType}}
+    {{#isNumeric}}
+    {{datatype}} *{{name}}_copy = NULL;
+    if ({{{name}}}) {
+        {{name}}_copy = malloc(sizeof({{datatype}}));
+        if ({{name}}_copy) *{{name}}_copy = *{{{name}}};
+    }
+    {{/isNumeric}}
+    {{#isBoolean}}
+    {{datatype}} *{{name}}_copy = NULL;
+    if ({{{name}}}) {
+        {{name}}_copy = malloc(sizeof({{datatype}}));
+        if ({{name}}_copy) *{{name}}_copy = *{{{name}}};
+    }
+    {{/isBoolean}}
+    {{/isPrimitiveType}}
+    {{/vars}}
     return {{classname}}_create_internal (
         {{#vars}}
+        {{#isPrimitiveType}}
+        {{#isNumeric}}
+        {{name}}_copy{{^-last}},{{/-last}}
+        {{/isNumeric}}
+        {{#isBoolean}}
+        {{name}}_copy{{^-last}},{{/-last}}
+        {{/isBoolean}}
+        {{^isNumeric}}
+        {{^isBoolean}}
         {{name}}{{^-last}},{{/-last}}
+        {{/isBoolean}}
+        {{/isNumeric}}
+        {{/isPrimitiveType}}
+        {{^isPrimitiveType}}
+        {{name}}{{^-last}},{{/-last}}
+        {{/isPrimitiveType}}
         {{/vars}}
         );
 }

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

@@ -15,18 +15,10 @@ static api_response_t *api_response_create_internal(
         return NULL;
     }
     memset(api_response_local_var, 0, sizeof(api_response_t));
-    if (code) {
-        api_response_local_var->code = malloc(sizeof(int));
-        if (!api_response_local_var->code) {
-            api_response_free(api_response_local_var);
-            return NULL;
-        }
-        *api_response_local_var->code = *code;
-    }
+    api_response_local_var->_library_owned = 1;
+    api_response_local_var->code = code;
     api_response_local_var->type = type;
     api_response_local_var->message = message;
-
-    api_response_local_var->_library_owned = 1;
     return api_response_local_var;
 }
 
@@ -35,8 +27,13 @@ __attribute__((deprecated)) api_response_t *api_response_create(
     char *type,
     char *message
     ) {
+    int *code_copy = NULL;
+    if (code) {
+        code_copy = malloc(sizeof(int));
+        if (code_copy) *code_copy = *code;
+    }
     return api_response_create_internal (
-        code,
+        code_copy,
         type,
         message
         );

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

@@ -14,26 +14,23 @@ static category_t *category_create_internal(
         return NULL;
     }
     memset(category_local_var, 0, sizeof(category_t));
-    if (id) {
-        category_local_var->id = malloc(sizeof(long));
-        if (!category_local_var->id) {
-            category_free(category_local_var);
-            return NULL;
-        }
-        *category_local_var->id = *id;
-    }
-    category_local_var->name = name;
-
     category_local_var->_library_owned = 1;
+    category_local_var->id = id;
+    category_local_var->name = name;
     return category_local_var;
 }
 
 __attribute__((deprecated)) category_t *category_create(
     long *id,
     char *name
     ) {
+    long *id_copy = NULL;
+    if (id) {
+        id_copy = malloc(sizeof(long));
+        if (id_copy) *id_copy = *id;
+    }
     return category_create_internal (
-        id,
+        id_copy,
         name
         );
 }

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

@@ -14,26 +14,23 @@ static MappedModel_t *MappedModel_create_internal(
         return NULL;
     }
     memset(MappedModel_local_var, 0, sizeof(MappedModel_t));
-    if (another_property) {
-        MappedModel_local_var->another_property = malloc(sizeof(int));
-        if (!MappedModel_local_var->another_property) {
-            MappedModel_free(MappedModel_local_var);
-            return NULL;
-        }
-        *MappedModel_local_var->another_property = *another_property;
-    }
-    MappedModel_local_var->uuid_property = uuid_property;
-
     MappedModel_local_var->_library_owned = 1;
+    MappedModel_local_var->another_property = another_property;
+    MappedModel_local_var->uuid_property = uuid_property;
     return MappedModel_local_var;
 }
 
 __attribute__((deprecated)) MappedModel_t *MappedModel_create(
     int *another_property,
     char *uuid_property
     ) {
+    int *another_property_copy = NULL;
+    if (another_property) {
+        another_property_copy = malloc(sizeof(int));
+        if (another_property_copy) *another_property_copy = *another_property;
+    }
     return MappedModel_create_internal (
-        another_property,
+        another_property_copy,
         uuid_property
         );
 }

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

@@ -14,10 +14,9 @@ static model_with_set_propertes_t *model_with_set_propertes_create_internal(
         return NULL;
     }
     memset(model_with_set_propertes_local_var, 0, sizeof(model_with_set_propertes_t));
+    model_with_set_propertes_local_var->_library_owned = 1;
     model_with_set_propertes_local_var->tag_set = tag_set;
     model_with_set_propertes_local_var->string_set = string_set;
-
-    model_with_set_propertes_local_var->_library_owned = 1;
     return model_with_set_propertes_local_var;
 }
 

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

@@ -35,42 +35,13 @@ static order_t *order_create_internal(
         return NULL;
     }
     memset(order_local_var, 0, sizeof(order_t));
-    if (id) {
-        order_local_var->id = malloc(sizeof(long));
-        if (!order_local_var->id) {
-            order_free(order_local_var);
-            return NULL;
-        }
-        *order_local_var->id = *id;
-    }
-    if (pet_id) {
-        order_local_var->pet_id = malloc(sizeof(long));
-        if (!order_local_var->pet_id) {
-            order_free(order_local_var);
-            return NULL;
-        }
-        *order_local_var->pet_id = *pet_id;
-    }
-    if (quantity) {
-        order_local_var->quantity = malloc(sizeof(int));
-        if (!order_local_var->quantity) {
-            order_free(order_local_var);
-            return NULL;
-        }
-        *order_local_var->quantity = *quantity;
-    }
+    order_local_var->_library_owned = 1;
+    order_local_var->id = id;
+    order_local_var->pet_id = pet_id;
+    order_local_var->quantity = quantity;
     order_local_var->ship_date = ship_date;
     order_local_var->status = status;
-    if (complete) {
-        order_local_var->complete = malloc(sizeof(int));
-        if (!order_local_var->complete) {
-            order_free(order_local_var);
-            return NULL;
-        }
-        *order_local_var->complete = *complete;
-    }
-
-    order_local_var->_library_owned = 1;
+    order_local_var->complete = complete;
     return order_local_var;
 }
 
@@ -82,13 +53,33 @@ __attribute__((deprecated)) order_t *order_create(
     openapi_petstore_order_STATUS_e status,
     int *complete
     ) {
+    long *id_copy = NULL;
+    if (id) {
+        id_copy = malloc(sizeof(long));
+        if (id_copy) *id_copy = *id;
+    }
+    long *pet_id_copy = NULL;
+    if (pet_id) {
+        pet_id_copy = malloc(sizeof(long));
+        if (pet_id_copy) *pet_id_copy = *pet_id;
+    }
+    int *quantity_copy = NULL;
+    if (quantity) {
+        quantity_copy = malloc(sizeof(int));
+        if (quantity_copy) *quantity_copy = *quantity;
+    }
+    int *complete_copy = NULL;
+    if (complete) {
+        complete_copy = malloc(sizeof(int));
+        if (complete_copy) *complete_copy = *complete;
+    }
     return order_create_internal (
-        id,
-        pet_id,
-        quantity,
+        id_copy,
+        pet_id_copy,
+        quantity_copy,
         ship_date,
         status,
-        complete
+        complete_copy
         );
 }
 

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

@@ -35,21 +35,13 @@ static pet_t *pet_create_internal(
         return NULL;
     }
     memset(pet_local_var, 0, sizeof(pet_t));
-    if (id) {
-        pet_local_var->id = malloc(sizeof(long));
-        if (!pet_local_var->id) {
-            pet_free(pet_local_var);
-            return NULL;
-        }
-        *pet_local_var->id = *id;
-    }
+    pet_local_var->_library_owned = 1;
+    pet_local_var->id = id;
     pet_local_var->category = category;
     pet_local_var->name = name;
     pet_local_var->photo_urls = photo_urls;
     pet_local_var->tags = tags;
     pet_local_var->status = status;
-
-    pet_local_var->_library_owned = 1;
     return pet_local_var;
 }
 
@@ -61,8 +53,13 @@ __attribute__((deprecated)) pet_t *pet_create(
     list_t *tags,
     openapi_petstore_pet_STATUS_e status
     ) {
+    long *id_copy = NULL;
+    if (id) {
+        id_copy = malloc(sizeof(long));
+        if (id_copy) *id_copy = *id;
+    }
     return pet_create_internal (
-        id,
+        id_copy,
         category,
         name,
         photo_urls,

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

@@ -14,26 +14,23 @@ static tag_t *tag_create_internal(
         return NULL;
     }
     memset(tag_local_var, 0, sizeof(tag_t));
-    if (id) {
-        tag_local_var->id = malloc(sizeof(long));
-        if (!tag_local_var->id) {
-            tag_free(tag_local_var);
-            return NULL;
-        }
-        *tag_local_var->id = *id;
-    }
-    tag_local_var->name = name;
-
     tag_local_var->_library_owned = 1;
+    tag_local_var->id = id;
+    tag_local_var->name = name;
     return tag_local_var;
 }
 
 __attribute__((deprecated)) tag_t *tag_create(
     long *id,
     char *name
     ) {
+    long *id_copy = NULL;
+    if (id) {
+        id_copy = malloc(sizeof(long));
+        if (id_copy) *id_copy = *id;
+    }
     return tag_create_internal (
-        id,
+        id_copy,
         name
         );
 }