Skip to content

[C][Client] Fix coredump when releasing the memory of an incompleted model #8190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Dec 16, 2020
Merged

[C][Client] Fix coredump when releasing the memory of an incompleted model #8190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 53 additions & 20 deletions modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,59 +214,92 @@ void {{classname}}_free({{classname}}_t *{{classname}}) {
{{^isPrimitiveType}}
{{#isModel}}
{{^isEnum}}
{{{complexType}}}_free({{{classname}}}->{{{name}}});
if ({{{classname}}}->{{{name}}}) {
{{{complexType}}}_free({{{classname}}}->{{{name}}});
{{classname}}->{{name}} = NULL;
}
{{/isEnum}}
{{/isModel}}
{{#isUuid}}
free({{{classname}}}->{{{name}}});
if ({{{classname}}}->{{{name}}}) {
free({{{classname}}}->{{{name}}});
{{classname}}->{{name}} = NULL;
}
{{/isUuid}}
{{#isEmail}}
free({{{classname}}}->{{{name}}});
if ({{{classname}}}->{{{name}}}) {
free({{{classname}}}->{{{name}}});
{{classname}}->{{name}} = NULL;
}
{{/isEmail}}
{{#isFreeFormObject}}
object_free({{{classname}}}->{{{name}}});
if ({{{classname}}}->{{{name}}}) {
object_free({{{classname}}}->{{{name}}});
{{classname}}->{{name}} = NULL;
}
{{/isFreeFormObject}}
{{/isPrimitiveType}}
{{#isPrimitiveType}}
{{^isEnum}}
{{#isString}}
free({{{classname}}}->{{{name}}});
if ({{{classname}}}->{{{name}}}) {
free({{{classname}}}->{{{name}}});
{{classname}}->{{name}} = NULL;
}
{{/isString}}
{{/isEnum}}
{{#isBinary}}
free({{{classname}}}->{{{name}}}->data);
if ({{{classname}}}->{{{name}}}) {
free({{{classname}}}->{{{name}}}->data);
{{classname}}->{{name}} = NULL;
}
{{/isBinary}}
{{#isDate}}
free({{{classname}}}->{{{name}}});
if ({{{classname}}}->{{{name}}}) {
free({{{classname}}}->{{{name}}});
{{classname}}->{{name}} = NULL;
}
{{/isDate}}
{{#isDateTime}}
free({{{classname}}}->{{{name}}});
if ({{{classname}}}->{{{name}}}) {
free({{{classname}}}->{{{name}}});
{{classname}}->{{name}} = NULL;
}
{{/isDateTime}}
{{/isPrimitiveType}}
{{/isContainer}}
{{#isContainer}}
{{#isArray}}
{{#isPrimitiveType}}
list_ForEach(listEntry, {{classname}}->{{name}}) {
free(listEntry->data);
if ({{{classname}}}->{{{name}}}) {
list_ForEach(listEntry, {{classname}}->{{name}}) {
free(listEntry->data);
}
list_free({{classname}}->{{name}});
{{classname}}->{{name}} = NULL;
}
list_free({{classname}}->{{name}});
{{/isPrimitiveType}}
{{^isPrimitiveType}}
list_ForEach(listEntry, {{classname}}->{{name}}) {
{{complexType}}_free(listEntry->data);
if ({{{classname}}}->{{{name}}}) {
list_ForEach(listEntry, {{classname}}->{{name}}) {
{{complexType}}_free(listEntry->data);
}
list_free({{classname}}->{{name}});
{{classname}}->{{name}} = NULL;
}
list_free({{classname}}->{{name}});
{{/isPrimitiveType}}
{{/isArray}}
{{#isMap}}
list_ForEach(listEntry, {{classname}}->{{name}}) {
keyValuePair_t *localKeyValue = (keyValuePair_t*) listEntry->data;
free (localKeyValue->key);
free (localKeyValue->value);
keyValuePair_free(localKeyValue);
if ({{{classname}}}->{{{name}}}) {
list_ForEach(listEntry, {{classname}}->{{name}}) {
keyValuePair_t *localKeyValue = (keyValuePair_t*) listEntry->data;
free (localKeyValue->key);
free (localKeyValue->value);
keyValuePair_free(localKeyValue);
}
list_free({{classname}}->{{name}});
{{classname}}->{{name}} = NULL;
}
list_free({{classname}}->{{name}});
{{/isMap}}
{{/isContainer}}
{{/vars}}
Expand Down
10 changes: 8 additions & 2 deletions samples/client/petstore/c/model/api_response.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,14 @@ void api_response_free(api_response_t *api_response) {
return ;
}
listEntry_t *listEntry;
free(api_response->type);
free(api_response->message);
if (api_response->type) {
free(api_response->type);
api_response->type = NULL;
}
if (api_response->message) {
free(api_response->message);
api_response->message = NULL;
}
free(api_response);
}

Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/c/model/category.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ void category_free(category_t *category) {
return ;
}
listEntry_t *listEntry;
free(category->name);
if (category->name) {
free(category->name);
category->name = NULL;
}
free(category);
}

Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/c/model/order.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ void order_free(order_t *order) {
return ;
}
listEntry_t *listEntry;
free(order->ship_date);
if (order->ship_date) {
free(order->ship_date);
order->ship_date = NULL;
}
free(order);
}

Expand Down
28 changes: 20 additions & 8 deletions samples/client/petstore/c/model/pet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,28 @@ void pet_free(pet_t *pet) {
return ;
}
listEntry_t *listEntry;
category_free(pet->category);
free(pet->name);
list_ForEach(listEntry, pet->photo_urls) {
free(listEntry->data);
if (pet->category) {
category_free(pet->category);
pet->category = NULL;
}
list_free(pet->photo_urls);
list_ForEach(listEntry, pet->tags) {
tag_free(listEntry->data);
if (pet->name) {
free(pet->name);
pet->name = NULL;
}
if (pet->photo_urls) {
list_ForEach(listEntry, pet->photo_urls) {
free(listEntry->data);
}
list_free(pet->photo_urls);
pet->photo_urls = NULL;
}
if (pet->tags) {
list_ForEach(listEntry, pet->tags) {
tag_free(listEntry->data);
}
list_free(pet->tags);
pet->tags = NULL;
}
list_free(pet->tags);
free(pet);
}

Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/c/model/tag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ void tag_free(tag_t *tag) {
return ;
}
listEntry_t *listEntry;
free(tag->name);
if (tag->name) {
free(tag->name);
tag->name = NULL;
}
free(tag);
}

Expand Down
30 changes: 24 additions & 6 deletions samples/client/petstore/c/model/user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,30 @@ void user_free(user_t *user) {
return ;
}
listEntry_t *listEntry;
free(user->username);
free(user->first_name);
free(user->last_name);
free(user->email);
free(user->password);
free(user->phone);
if (user->username) {
free(user->username);
user->username = NULL;
}
if (user->first_name) {
free(user->first_name);
user->first_name = NULL;
}
if (user->last_name) {
free(user->last_name);
user->last_name = NULL;
}
if (user->email) {
free(user->email);
user->email = NULL;
}
if (user->password) {
free(user->password);
user->password = NULL;
}
if (user->phone) {
free(user->phone);
user->phone = NULL;
}
free(user);
}

Expand Down