Fix rmw_validate_namespace{_with_size} error handling. (#386)

* Fix rmw_validate_namespace{_with_size} error handling. It should always set an error, even on invalid arguments. Signed-off-by: Chris Lalancette <[email protected]>
ros2 · Dec 24, 2024 · eba8048 · eba8048
1 parent 6d00aec
commit eba8048
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/rmw/src/validate_namespace.c b/rmw/src/validate_namespace.c
@@ -29,9 +29,8 @@ rmw_validate_namespace(
   int * validation_result,
   size_t * invalid_index)
 {
-  if (!namespace_) {
-    return RMW_RET_INVALID_ARGUMENT;
-  }
+  RCUTILS_CHECK_ARGUMENT_FOR_NULL(namespace_, RMW_RET_INVALID_ARGUMENT);
+
   return rmw_validate_namespace_with_size(
     namespace_, strlen(namespace_), validation_result, invalid_index);
 }
@@ -43,12 +42,8 @@ rmw_validate_namespace_with_size(
   int * validation_result,
   size_t * invalid_index)
 {
-  if (!namespace_) {
-    return RMW_RET_INVALID_ARGUMENT;
-  }
-  if (!validation_result) {
-    return RMW_RET_INVALID_ARGUMENT;
-  }
+  RCUTILS_CHECK_ARGUMENT_FOR_NULL(namespace_, RMW_RET_INVALID_ARGUMENT);
+  RCUTILS_CHECK_ARGUMENT_FOR_NULL(validation_result, RMW_RET_INVALID_ARGUMENT);
 
   // Special case for root namepsace
   if (namespace_length == 1 && namespace_[0] == '/') {