Skip to content

Commit de940fe

Browse files
Merge pull request #275 from amgross/develop
Don't check for null pointer before free, it should be handled in the free function
2 parents 82a8222 + b9c5fa8 commit de940fe

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

erpc_c/port/erpc_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void *erpc_malloc(size_t size);
4040
/*!
4141
* @brief This function free given memory block.
4242
*
43-
* @param[in] ptr Pointer to memory which should be freed.
43+
* @param[in] ptr Pointer to memory which should be freed, or NULL.
4444
*/
4545
void erpc_free(void *ptr);
4646

erpcgen/src/templates/c_common_functions.template

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,7 @@ else
377377

378378
{# ---------------- freeData ---------------- #}
379379
{% def freeData(info) %}
380-
if ({$info.freeName})
381-
{
382-
erpc_free({$info.freeName});
383-
}
380+
erpc_free({$info.freeName});
384381
{% enddef ------------------------------- freeData %}
385382

386383
{# ---------------- freeStruct ---------------- #}
@@ -400,10 +397,7 @@ if ({$info.name})
400397
{% if info.needFreeingCall == true %}
401398
{$freeArray(info)}
402399
{% endif %}
403-
if ({$info.name})
404-
{
405-
erpc_free({$info.name});
406-
}
400+
erpc_free({$info.name});
407401
{% enddef ------------------------------- freeList %}
408402

409403
{# ---------------- freeArray ---------------- #}

0 commit comments

Comments
 (0)