Skip to content

Don't check for null pointer before free, it should be handled in the free function #275

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
merged 1 commit into from
Jun 6, 2022
Merged

Don't check for null pointer before free, it should be handled in the free function #275

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
2 changes: 1 addition & 1 deletion erpc_c/port/erpc_port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void *erpc_malloc(size_t size);
/*!
* @brief This function free given memory block.
*
* @param[in] ptr Pointer to memory which should be freed.
* @param[in] ptr Pointer to memory which should be freed, or NULL.
*/
void erpc_free(void *ptr);

Expand Down
10 changes: 2 additions & 8 deletions erpcgen/src/templates/c_common_functions.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,7 @@ else

{# ---------------- freeData ---------------- #}
{% def freeData(info) %}
if ({$info.freeName})
{
erpc_free({$info.freeName});
}
erpc_free({$info.freeName});
{% enddef ------------------------------- freeData %}

{# ---------------- freeStruct ---------------- #}
Expand All @@ -400,10 +397,7 @@ if ({$info.name})
{% if info.needFreeingCall == true %}
{$freeArray(info)}
{% endif %}
if ({$info.name})
{
erpc_free({$info.name});
}
erpc_free({$info.name});
{% enddef ------------------------------- freeList %}

{# ---------------- freeArray ---------------- #}
Expand Down