fix leak in __wait_set_clean_up (ros2#418)

Signed-off-by: Dirk Thomas <[email protected]>
aws-ros-dev · Apr 25, 2019 · f8ced7c · f8ced7c
1 parent 26744b0
commit f8ced7c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/rcl/src/rcl/wait.c b/rcl/src/rcl/wait.c
@@ -83,11 +83,9 @@ __wait_set_is_valid(const rcl_wait_set_t * wait_set)
 static void
 __wait_set_clean_up(rcl_wait_set_t * wait_set, rcl_allocator_t allocator)
 {
-  if (wait_set->subscriptions) {
-    rcl_ret_t ret = rcl_wait_set_resize(wait_set, 0, 0, 0, 0, 0);
-    (void)ret;  // NO LINT
-    assert(RCL_RET_OK == ret);  // Defensive, shouldn't fail with size 0.
-  }
+  rcl_ret_t ret = rcl_wait_set_resize(wait_set, 0, 0, 0, 0, 0);
+  (void)ret;  // NO LINT
+  assert(RCL_RET_OK == ret);  // Defensive, shouldn't fail with size 0.
   if (wait_set->impl) {
     allocator.deallocate(wait_set->impl, allocator.state);
     wait_set->impl = NULL;