Output warning is ns remapping is invalid but starts with /

ros2 · Jun 2, 2018 · d838bd1 · d838bd1
1 parent ba4ee35
commit d838bd1
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/rcl/src/rcl/arguments.c b/rcl/src/rcl/arguments.c
@@ -658,11 +658,20 @@ _rcl_parse_remap_namespace_replacement(
   ret = _rcl_parse_remap_fully_qualified_namespace(lex_lookahead);
   if (RCL_RET_OK != ret) {
     if (RCL_RET_INVALID_REMAP_RULE == ret) {
+      // The name didn't start with a leading forward slash
       RCUTILS_LOG_WARN_NAMED(
         ROS_PACKAGE_NAME, "Namespace not remapped to a fully qualified name (found: %s)", ns_start);
     }
     return ret;
   }
+  // There should be nothing left
+  ret = rcl_lexer_lookahead2_expect(lex_lookahead, RCL_LEXEME_EOF, NULL, NULL);
+  if (RCL_RET_OK != ret) {
+    // The name must have started with a leading forward slash but had an otherwise invalid format
+    RCUTILS_LOG_WARN_NAMED(
+      ROS_PACKAGE_NAME, "Namespace not remapped to a fully qualified name (found: %s)", ns_start);
+    return ret;
+  }
 
   // Copy namespace into rule
   const char * ns_end = rcl_lexer_lookahead2_get_text(lex_lookahead);