Make rmw_destroy_wait_set return RMW_RET_INVALID_ARGUMENT (#498)

christophebedard-apexai · web-flow · commit 80e0996eb1e9 · 2024-06-13T15:12:06.000-04:00
Signed-off-by: Christophe Bedard &lt;christophe.bedard@apex.ai&gt;
diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp
@@ -4195,7 +4195,7 @@ extern "C" rmw_wait_set_t * rmw_create_wait_set(rmw_context_t * context, size_t
 
 extern "C" rmw_ret_t rmw_destroy_wait_set(rmw_wait_set_t * wait_set)
 {
-  RET_NULL(wait_set);
+  RMW_CHECK_ARGUMENT_FOR_NULL(wait_set, RMW_RET_INVALID_ARGUMENT);
   RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
     wait_set, wait_set->implementation_identifier,
     eclipse_cyclonedds_identifier, return RMW_RET_INCORRECT_RMW_IMPLEMENTATION);

Original file line number	Diff line number	Diff line change
`@@ -4195,7 +4195,7 @@ extern "C" rmw_wait_set_t * rmw_create_wait_set(rmw_context_t * context, size_t`
`4195`	`4195`
`4196`	`4196`	`extern "C" rmw_ret_t rmw_destroy_wait_set(rmw_wait_set_t * wait_set)`
`4197`	`4197`	`{`
`4198`		`- RET_NULL(wait_set);`
	`4198`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(wait_set, RMW_RET_INVALID_ARGUMENT);`
`4199`	`4199`	`RMW_CHECK_TYPE_IDENTIFIERS_MATCH(`
`4200`	`4200`	`wait_set, wait_set->implementation_identifier,`
`4201`	`4201`	`eclipse_cyclonedds_identifier, return RMW_RET_INCORRECT_RMW_IMPLEMENTATION);`