Add check in rcl_remap_name instead

Nikolai Morin · Nikolai Morin · commit 3fed3b1fe720 · 2020-12-18T14:41:48.000+01:00
Signed-off-by: Nikolai Morin &lt;nikolai.morin@apex.ai&gt;
diff --git a/rcl/src/rcl/remap.c b/rcl/src/rcl/remap.c
@@ -142,9 +142,7 @@ rcl_remap_first_match(
         }
         continue;
       }
-      if (NULL != name) {
-        matched = (0 == strcmp(expanded_match, name));
-      }
+      matched = (0 == strcmp(expanded_match, name));
       allocator.deallocate(expanded_match, allocator.state);
     } else {
       // nodename and namespace replacement apply if the type and node name prefix checks passed
@@ -174,6 +172,9 @@ rcl_remap_name(
 {
   RCL_CHECK_ARGUMENT_FOR_NULL(node_name, RCL_RET_INVALID_ARGUMENT);
   RCL_CHECK_ARGUMENT_FOR_NULL(output_name, RCL_RET_INVALID_ARGUMENT);
+  if (type_bitmask & (RCL_TOPIC_REMAP | RCL_SERVICE_REMAP)) {
+    RCL_CHECK_ARGUMENT_FOR_NULL(name, RCL_RET_INVALID_ARGUMENT);
+  }
   if (NULL != local_arguments && NULL == local_arguments->impl) {
     local_arguments = NULL;
   }

Original file line number	Diff line number	Diff line change
`@@ -142,9 +142,7 @@ rcl_remap_first_match(`
`142`	`142`	`}`
`143`	`143`	`continue;`
`144`	`144`	`}`
`145`		`- if (NULL != name) {`
`146`		`- matched = (0 == strcmp(expanded_match, name));`
`147`		`- }`
	`145`	`+ matched = (0 == strcmp(expanded_match, name));`
`148`	`146`	`allocator.deallocate(expanded_match, allocator.state);`
`149`	`147`	`} else {`
`150`	`148`	`// nodename and namespace replacement apply if the type and node name prefix checks passed`
`@@ -174,6 +172,9 @@ rcl_remap_name(`
`174`	`172`	`{`
`175`	`173`	`RCL_CHECK_ARGUMENT_FOR_NULL(node_name, RCL_RET_INVALID_ARGUMENT);`
`176`	`174`	`RCL_CHECK_ARGUMENT_FOR_NULL(output_name, RCL_RET_INVALID_ARGUMENT);`
	`175`	`+ if (type_bitmask & (RCL_TOPIC_REMAP \| RCL_SERVICE_REMAP)) {`
	`176`	`+ RCL_CHECK_ARGUMENT_FOR_NULL(name, RCL_RET_INVALID_ARGUMENT);`
	`177`	`+ }`
`177`	`178`	`if (NULL != local_arguments && NULL == local_arguments->impl) {`
`178`	`179`	`local_arguments = NULL;`
`179`	`180`	`}`