fix memory leak (ros2#1994)

Signed-off-by: Chen Lihui <lihui.chen@sony.com>
irobot-ros · Apr 29, 2023 · e3ac684 · e3ac684
1 parent 3f4ce2f
commit e3ac684
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/rclcpp/src/rclcpp/parameter_map.cpp b/rclcpp/src/rclcpp/parameter_map.cpp
@@ -15,6 +15,8 @@
 #include <string>
 #include <vector>
 
+#include "rcpputils/find_and_replace.hpp"
+#include "rcpputils/scope_exit.hpp"
 #include "rclcpp/parameter_map.hpp"
 
 using rclcpp::exceptions::InvalidParametersException;
@@ -132,9 +134,11 @@ rclcpp::parameter_map_from_yaml_file(const std::string & yaml_filename)
 {
   rcutils_allocator_t allocator = rcutils_get_default_allocator();
   rcl_params_t * rcl_parameters = rcl_yaml_node_struct_init(allocator);
+  RCPPUTILS_SCOPE_EXIT(rcl_yaml_node_struct_fini(rcl_parameters); );
   const char * path = yaml_filename.c_str();
   if (!rcl_parse_yaml_file(path, rcl_parameters)) {
     rclcpp::exceptions::throw_from_rcl_error(RCL_RET_ERROR);
   }
+
   return rclcpp::parameter_map_from(rcl_parameters);
 }