Reset RMWCount when DEALLOC rmw storage of wait set (#209)

* Reset RMWCount when DEALLOC rmw storage of wait set It is safe to reset RMWCount when free rmw storage of wait set Signed-off-by: jwang <[email protected]> * setting RMWCount to 0 only when RMWStorage is set to NULL Signed-off-by: jwang <[email protected]>
ros2 · Jan 23, 2018 · 1d35c60 · 1d35c60
1 parent 4ed6c56
commit 1d35c60
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/rcl/src/rcl/wait.c b/rcl/src/rcl/wait.c
@@ -320,6 +320,7 @@ rcl_wait_set_get_allocator(const rcl_wait_set_t * wait_set, rcl_allocator_t * al
   if (wait_set->impl->RMWStorage) { \
     allocator.deallocate((void *)wait_set->impl->RMWStorage, allocator.state); \
     wait_set->impl->RMWStorage = NULL; \
+    wait_set->impl->RMWCount = 0; \
   }
 
 #define SET_RESIZE_RMW_REALLOC(Type, RMWStorage, RMWCount) \