Fix memory leak in tracetools::get_symbol()

Signed-off-by: Christophe Bedard <christophe.bedard@apex.ai>
ros2 · Feb 15, 2023 · 93bbc61 · 93bbc61
1 parent 01b1924
commit 93bbc61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/rclcpp/include/rclcpp/any_service_callback.hpp b/rclcpp/include/rclcpp/any_service_callback.hpp
@@ -191,10 +191,12 @@ class AnyServiceCallback
 #ifndef TRACETOOLS_DISABLED
     std::visit(
       [this](auto && arg) {
+        char * symbol = tracetools::get_symbol(arg);
         TRACEPOINT(
           rclcpp_callback_register,
           static_cast<const void *>(this),
-          tracetools::get_symbol(arg));
+          symbol);
+        std::free(symbol);
       }, callback_);
 #endif  // TRACETOOLS_DISABLED
   }

diff --git a/rclcpp/include/rclcpp/any_subscription_callback.hpp b/rclcpp/include/rclcpp/any_subscription_callback.hpp
@@ -965,10 +965,12 @@ class AnySubscriptionCallback
 #ifndef TRACETOOLS_DISABLED
     std::visit(
       [this](auto && callback) {
+        char * symbol = tracetools::get_symbol(callback);;
         TRACEPOINT(
           rclcpp_callback_register,
           static_cast<const void *>(this),
-          tracetools::get_symbol(callback));
+          symbol);
+        std::free(symbol);
       }, callback_variant_);
 #endif  // TRACETOOLS_DISABLED
   }

diff --git a/rclcpp/include/rclcpp/timer.hpp b/rclcpp/include/rclcpp/timer.hpp
@@ -227,10 +227,12 @@ class GenericTimer : public TimerBase
       rclcpp_timer_callback_added,
       static_cast<const void *>(get_timer_handle().get()),
       reinterpret_cast<const void *>(&callback_));
+    char * symbol = tracetools::get_symbol(callback_);
     TRACEPOINT(
       rclcpp_callback_register,
       reinterpret_cast<const void *>(&callback_),
-      tracetools::get_symbol(callback_));
+      symbol);
+    std::free(symbol);
   }
 
   /// Default destructor.