Fix remapping (#7)

micro-ROS · Jul 1, 2020 · 3216959 · 3216959
1 parent d651b11
commit 3216959
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/rcl/src/rcl/client.c b/rcl/src/rcl/client.c
@@ -146,6 +146,9 @@ rcl_client_init(
     remapped_service_name = expanded_service_name;
     expanded_service_name = NULL;
   }
+#else
+  remapped_service_name = (char *)allocator->allocate(strlen(expanded_service_name) + 1, allocator->state);
+  memcpy(remapped_service_name, expanded_service_name, strlen(expanded_service_name) + 1);
 #endif // RCL_COMMAND_LINE_ENABLED
 
   // Validate the expanded service name.

diff --git a/rcl/src/rcl/publisher.c b/rcl/src/rcl/publisher.c
@@ -143,6 +143,9 @@ rcl_publisher_init(
     remapped_topic_name = expanded_topic_name;
     expanded_topic_name = NULL;
   }
+#else
+  remapped_topic_name = (char *)allocator->allocate(strlen(expanded_topic_name) + 1, allocator->state);
+  memcpy(remapped_topic_name, expanded_topic_name, strlen(expanded_topic_name) + 1);
 #endif // RCL_COMMAND_LINE_ENABLED
 
   // Validate the expanded topic name.

diff --git a/rcl/src/rcl/service.c b/rcl/src/rcl/service.c
@@ -144,6 +144,9 @@ rcl_service_init(
     remapped_service_name = expanded_service_name;
     expanded_service_name = NULL;
   }
+#else
+  remapped_service_name = (char *)allocator->allocate(strlen(expanded_service_name) + 1, allocator->state);
+  memcpy(remapped_service_name, expanded_service_name, strlen(expanded_service_name) + 1);
 #endif // RCL_COMMAND_LINE_ENABLED
 
   // Validate the expanded service name.

diff --git a/rcl/src/rcl/subscription.c b/rcl/src/rcl/subscription.c
@@ -139,6 +139,9 @@ rcl_subscription_init(
     remapped_topic_name = expanded_topic_name;
     expanded_topic_name = NULL;
   }
+#else
+  remapped_topic_name = (char *)allocator->allocate(strlen(expanded_topic_name) + 1, allocator->state);
+  memcpy(remapped_topic_name, expanded_topic_name, strlen(expanded_topic_name) + 1);
 #endif // RCL_COMMAND_LINE_ENABLED
 
   // Validate the expanded topic name.