Skip to content

Commit eba8048

Browse files
authored
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]>
1 parent 6d00aec commit eba8048

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

rmw/src/validate_namespace.c

+4-9
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ rmw_validate_namespace(
2929
int * validation_result,
3030
size_t * invalid_index)
3131
{
32-
if (!namespace_) {
33-
return RMW_RET_INVALID_ARGUMENT;
34-
}
32+
RCUTILS_CHECK_ARGUMENT_FOR_NULL(namespace_, RMW_RET_INVALID_ARGUMENT);
33+
3534
return rmw_validate_namespace_with_size(
3635
namespace_, strlen(namespace_), validation_result, invalid_index);
3736
}
@@ -43,12 +42,8 @@ rmw_validate_namespace_with_size(
4342
int * validation_result,
4443
size_t * invalid_index)
4544
{
46-
if (!namespace_) {
47-
return RMW_RET_INVALID_ARGUMENT;
48-
}
49-
if (!validation_result) {
50-
return RMW_RET_INVALID_ARGUMENT;
51-
}
45+
RCUTILS_CHECK_ARGUMENT_FOR_NULL(namespace_, RMW_RET_INVALID_ARGUMENT);
46+
RCUTILS_CHECK_ARGUMENT_FOR_NULL(validation_result, RMW_RET_INVALID_ARGUMENT);
5247

5348
// Special case for root namepsace
5449
if (namespace_length == 1 && namespace_[0] == '/') {

0 commit comments

Comments
 (0)