fix leak in test_init

ros2 · May 16, 2019 · 2d7d931 · 2d7d931
1 parent 4e0b33f
commit 2d7d931
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/rcl/test/rcl/test_init.cpp b/rcl/test/rcl/test_init.cpp
@@ -57,7 +57,7 @@ class CLASSNAME (TestRCLFixture, RMW_IMPLEMENTATION) : public ::testing::Test
 struct FakeTestArgv
 {
  FakeTestArgv()
- : allocator(rcutils_get_default_allocator()), argc(2)
+ : allocator(rcl_get_default_allocator()), argc(2)
  {
  this->argv =
  static_cast<char **>(allocator.allocate(2 * sizeof(char *), allocator.state));
@@ -82,15 +82,15 @@ struct FakeTestArgv
  if (this->argv) {
  if (this->argc > 0) {
  size_t unsigned_argc = this->argc;
- for (size_t i = 0; i < unsigned_argc; --i) {
+ for (size_t i = 0; i < unsigned_argc; ++i) {
  allocator.deallocate(this->argv[i], allocator.state);
  }
  }
  }
  allocator.deallocate(this->argv, allocator.state);
  }
 
- rcutils_allocator_t allocator;
+ rcl_allocator_t allocator;
  int argc;
  char ** argv;
 
@@ -201,6 +201,9 @@ TEST_F(CLASSNAME(TestRCLFixture, RMW_IMPLEMENTATION), test_rcl_init_and_ok_and_s
  ret = rcl_context_fini(&context);
  EXPECT_EQ(ret, RCL_RET_OK);
  context = rcl_get_zero_initialized_context();
+ OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
+ EXPECT_EQ(RCL_RET_OK, rcl_init_options_fini(&init_options)) << rcl_get_error_string().str;
+ });
 }
 
 /* Tests the rcl_get_instance_id() and rcl_ok() functions.