From 7e578a8fd64da2d94905675d123b97cb55fcdf8d Mon Sep 17 00:00:00 2001
From: Jackie Kay <jacquelinekay1@gmail.com>
Date: Fri, 12 Feb 2016 11:32:10 -0800
Subject: [PATCH] Make failed rcl_node_init to clean up fully, to allow
 recreating a node.

Update tests to not mask the improper cleanup.
---
 rcl/src/rcl/node.c         | 1 +
 rcl/test/rcl/test_node.cpp | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/rcl/src/rcl/node.c b/rcl/src/rcl/node.c
index ccb1201..090134c 100644
--- a/rcl/src/rcl/node.c
+++ b/rcl/src/rcl/node.c
@@ -107,6 +107,7 @@ fail:
   if (node->impl) {
     allocator->deallocate(node->impl, allocator->state);
   }
+  *node = rcl_get_zero_initialized_node();
   return fail_ret;
 }
 
diff --git a/rcl/test/rcl/test_node.cpp b/rcl/test/rcl/test_node.cpp
index 7632ece..49706c9 100644
--- a/rcl/test/rcl/test_node.cpp
+++ b/rcl/test/rcl/test_node.cpp
@@ -261,7 +261,6 @@ TEST_F(TestNodeFixture, test_rcl_node_life_cycle) {
   ret = rcl_node_init(&node, name, &options_with_invalid_allocator);
   EXPECT_EQ(RCL_RET_INVALID_ARGUMENT, ret) << "Expected RCL_RET_INVALID_ARGUMENT";
   rcl_reset_error();
-  node = rcl_get_zero_initialized_node();
   // Try with failing allocator.
   rcl_node_options_t options_with_failing_allocator = rcl_node_get_default_options();
   options_with_failing_allocator.allocator.allocate = failing_malloc;
@@ -270,7 +269,6 @@ TEST_F(TestNodeFixture, test_rcl_node_life_cycle) {
   ret = rcl_node_init(&node, name, &options_with_failing_allocator);
   EXPECT_EQ(RCL_RET_BAD_ALLOC, ret) << "Expected RCL_RET_BAD_ALLOC";
   rcl_reset_error();
-  node = rcl_get_zero_initialized_node();
   // Try fini with invalid arguments.
   ret = rcl_node_fini(nullptr);
   EXPECT_EQ(RCL_RET_INVALID_ARGUMENT, ret) << "Expected RCL_RET_INVALID_ARGUMENT";
@@ -283,7 +281,6 @@ TEST_F(TestNodeFixture, test_rcl_node_life_cycle) {
   EXPECT_EQ(RCL_RET_OK, ret);
   ret = rcl_node_fini(&node);
   EXPECT_EQ(RCL_RET_OK, ret);
-  node = rcl_get_zero_initialized_node();
   // Try repeated init and fini calls.
   ret = rcl_node_init(&node, name, &default_options);
   EXPECT_EQ(RCL_RET_OK, ret);
@@ -293,7 +290,6 @@ TEST_F(TestNodeFixture, test_rcl_node_life_cycle) {
   EXPECT_EQ(RCL_RET_OK, ret);
   ret = rcl_node_fini(&node);
   EXPECT_EQ(RCL_RET_OK, ret);
-  node = rcl_get_zero_initialized_node();
   // Try with a specific domain id.
   rcl_node_options_t options_with_custom_domain_id = rcl_node_get_default_options();
   options_with_custom_domain_id.domain_id = 42;
@@ -301,12 +297,10 @@ TEST_F(TestNodeFixture, test_rcl_node_life_cycle) {
   if (is_windows && is_opensplice) {
     // A custom domain id is not expected to work on Windows with Opensplice.
     EXPECT_NE(RCL_RET_OK, ret);
-    node = rcl_get_zero_initialized_node();
   } else {
     // This is the normal check.
     EXPECT_EQ(RCL_RET_OK, ret);
     ret = rcl_node_fini(&node);
     EXPECT_EQ(RCL_RET_OK, ret);
-    node = rcl_get_zero_initialized_node();
   }
 }