Fix memory errors

Signed-off-by: Stephen Brawner <[email protected]>

Author: brawner

rcl_yaml_param_parser/test/test_namespace.cpp

@@ -28,26 +28,23 @@
 TEST(TestNamespace, add_name_to_ns) {
   rcutils_allocator_t allocator = rcutils_get_default_allocator();
   namespace_tracker_t ns_tracker;
-  ns_tracker.node_ns = rcutils_strdup("", allocator);
-  ASSERT_STREQ("", ns_tracker.node_ns);
-  ns_tracker.parameter_ns = rcutils_strdup("", allocator);
-  ASSERT_STREQ("", ns_tracker.parameter_ns);
-  OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
-  {
-    allocator.deallocate(ns_tracker.node_ns, allocator.state);
-    allocator.deallocate(ns_tracker.parameter_ns, allocator.state);
-  });
+  ns_tracker.node_ns = nullptr;
+  ns_tracker.parameter_ns = nullptr;
   ns_tracker.num_node_ns = 0;
   ns_tracker.num_parameter_ns = 0;
 
   rcutils_ret_t ret = add_name_to_ns(&ns_tracker, nullptr, NS_TYPE_NODE, allocator);
   EXPECT_EQ(RCUTILS_RET_INVALID_ARGUMENT, ret) << rcutils_get_error_string().str;
-  EXPECT_STREQ("", ns_tracker.node_ns);
+  EXPECT_EQ(nullptr, ns_tracker.node_ns);
 
   ret = add_name_to_ns(&ns_tracker, "node1", NS_TYPE_NODE, allocator);
   EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;
   EXPECT_STREQ("node1", ns_tracker.node_ns);
   EXPECT_EQ(1u, ns_tracker.num_node_ns);
+  OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
+  {
+    allocator.deallocate(ns_tracker.node_ns, allocator.state);
+  });
 
   ret = add_name_to_ns(&ns_tracker, "node2", NS_TYPE_NODE, allocator);
   EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;
@@ -58,6 +55,10 @@ TEST(TestNamespace, add_name_to_ns) {
   EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;
   EXPECT_STREQ("param1", ns_tracker.parameter_ns);
   EXPECT_EQ(1u, ns_tracker.num_parameter_ns);
+  OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
+  {
+    allocator.deallocate(ns_tracker.parameter_ns, allocator.state);
+  });
 
   ret = add_name_to_ns(&ns_tracker, "param2", NS_TYPE_PARAM, allocator);
   EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;

rcl_yaml_param_parser/test/test_parse.cpp

@@ -29,6 +29,8 @@ TEST(TestParse, parse_value) {
   rcutils_allocator_t allocator = rcutils_get_default_allocator();
   yaml_event_t event;
   event.type = YAML_NO_EVENT;
+  event.start_mark = {0u, 0u, 0u};
+  event.data.scalar = {NULL, NULL, NULL, 1u, 0, 0, YAML_ANY_SCALAR_STYLE};
 
   bool is_seq = false;
   size_t node_idx = 0u;
@@ -109,6 +111,8 @@ TEST(TestParse, parse_value_sequence) {
   rcutils_allocator_t allocator = rcutils_get_default_allocator();
   yaml_event_t event;
   event.type = YAML_NO_EVENT;
+  event.start_mark = {0u, 0u, 0u};
+  event.data.scalar = {NULL, NULL, NULL, 1u, 0, 0, YAML_ANY_SCALAR_STYLE};
 
   bool is_seq = true;
   size_t node_idx = 0u;
@@ -176,7 +180,7 @@ TEST(TestParse, parse_value_sequence) {
   allocator.deallocate(
     params_st->params[0].parameter_values[0].integer_array_value->values, allocator.state);
   allocator.deallocate(
-    params_st->params[0].parameter_values[0].integer_value, allocator.state);
+    params_st->params[0].parameter_values[0].integer_array_value, allocator.state);
   params_st->params[0].parameter_values[0].integer_array_value = nullptr;
 
   // double value
@@ -235,13 +239,17 @@ TEST(TestParse, parse_value_sequence) {
     RCUTILS_RET_OK,
     rcutils_string_array_fini(params_st->params[0].parameter_values[0].string_array_value)) <<
     rcutils_get_error_string().str;
+  allocator.deallocate(
+    params_st->params[0].parameter_values[0].string_array_value, allocator.state);
   params_st->params[0].parameter_values[0].string_array_value = nullptr;
 }
 
 TEST(TestParse, parse_value_bad_args) {
   rcutils_allocator_t allocator = rcutils_get_default_allocator();
   yaml_event_t event;
   event.type = YAML_NO_EVENT;
+  event.start_mark = {0u, 0u, 0u};
+  event.data.scalar = {NULL, NULL, NULL, 1u, 0, 0, YAML_ANY_SCALAR_STYLE};
 
   bool is_seq = false;
   size_t node_idx = 0u;
@@ -280,8 +288,7 @@ TEST(TestParse, parse_value_bad_args) {
   params_st->num_nodes = 1u;
 
   // event.data.scaler.value is NULL, but event.data.scalar.length > 0
-  event.start_mark = {0u, 0u, 0u};
-  event.data.scalar = {NULL, NULL, NULL, 1u, 0, 0, YAML_ANY_SCALAR_STYLE};
+  event.data.scalar.value = NULL;
   EXPECT_EQ(
     RCUTILS_RET_INVALID_ARGUMENT,
     parse_value(event, is_seq, node_idx, parameter_idx, &seq_data_type, params_st));
@@ -317,6 +324,8 @@ TEST(TestParse, parse_key_bad_args)
 {
   yaml_event_t event;
   event.type = YAML_NO_EVENT;
+  event.start_mark = {0u, 0u, 0u};
+
   rcutils_allocator_t allocator = rcutils_get_default_allocator();
   uint32_t map_level = MAP_NODE_NAME_LVL;
   bool is_new_map = false;