Fix transport tasks cleanup

eclipse-zenoh · Jan 28, 2025 · 8e71d5e · 8e71d5e
1 parent 29cdaa3
commit 8e71d5e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/src/system/espidf/system.c b/src/system/espidf/system.c
@@ -129,6 +129,7 @@ z_result_t z_task_cancel(_z_task_t *task) {
 void _z_task_free(_z_task_t **task) {
     z_free((*task)->join_event);
     z_free(*task);
+    *task = NULL;
 }
 
 /*------------------ Mutex ------------------*/

diff --git a/src/system/rpi_pico/system.c b/src/system/rpi_pico/system.c
@@ -115,6 +115,7 @@ z_result_t _z_task_cancel(_z_task_t *task) {
 void _z_task_free(_z_task_t **task) {
     z_free((*task)->join_event);
     z_free(*task);
+    *task = NULL;
 }
 
 /*------------------ Mutex ------------------*/

diff --git a/src/transport/common/transport.c b/src/transport/common/transport.c
@@ -29,6 +29,7 @@ void _z_common_transport_clear(_z_transport_common_t *ztc, bool detach_tasks) {
         } else {
             _z_task_join(ztc->_read_task);
         }
+        _z_task_free(&ztc->_read_task);
         z_free(ztc->_read_task);
         ztc->_read_task = NULL;
     }
@@ -39,6 +40,7 @@ void _z_common_transport_clear(_z_transport_common_t *ztc, bool detach_tasks) {
         } else {
             _z_task_join(ztc->_lease_task);
         }
+        _z_task_free(&ztc->_lease_task);
         z_free(ztc->_lease_task);
         ztc->_lease_task = NULL;
     }