update usage of rcutils_join_path() (#208)

* update usage of rcutils_join_path() * use allocator to free too
ros2 · Jun 17, 2018 · 8ee72cd · 8ee72cd
1 parent 636721d
commit 8ee72cd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/rmw_fastrtps_cpp/src/rmw_node.cpp b/rmw_fastrtps_cpp/src/rmw_node.cpp
@@ -196,7 +196,8 @@ get_security_file_paths(
   std::string file_prefix("file://");
 
   for (size_t i = 0; i < num_files; i++) {
-    char * file_path = rcutils_join_path(node_secure_root, file_names[i]);
+    rcutils_allocator_t allocator = rcutils_get_default_allocator();
+    char * file_path = rcutils_join_path(node_secure_root, file_names[i], allocator);
 
     if (!file_path) {
       return false;
@@ -205,11 +206,11 @@ get_security_file_paths(
     if (rcutils_is_readable(file_path)) {
       security_files_paths[i] = file_prefix + std::string(file_path);
     } else {
-      free(file_path);
+      allocator.deallocate(file_path, allocator.state);
       return false;
     }
 
-    free(file_path);
+    allocator.deallocate(file_path, allocator.state);
   }
 
   return true;