From fd3ef8ff42afe94c263250745f9eba501daee7b1 Mon Sep 17 00:00:00 2001 From: lobotuerk Date: Thu, 17 Sep 2020 16:00:11 -0300 Subject: [PATCH 1/3] added take_serialization_errors Signed-off-by: lobotuerk --- rmw_cyclonedds_cpp/src/rmw_node.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp index 439f7f83..80f89091 100644 --- a/rmw_cyclonedds_cpp/src/rmw_node.cpp +++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp @@ -2638,10 +2638,16 @@ static rmw_ret_t rmw_take_ser_int( rmw_serialized_message_t * serialized_message, bool * taken, rmw_message_info_t * message_info) { - RET_NULL(taken); - RET_NULL(serialized_message); - RET_NULL(subscription); - RET_WRONG_IMPLID(subscription); + RMW_CHECK_ARGUMENT_FOR_NULL( + taken, RMW_RET_INVALID_ARGUMENT); + RMW_CHECK_ARGUMENT_FOR_NULL( + serialized_message, RMW_RET_INVALID_ARGUMENT); + RMW_CHECK_ARGUMENT_FOR_NULL( + subscription, RMW_RET_INVALID_ARGUMENT); + RMW_CHECK_TYPE_IDENTIFIERS_MATCH( + subscription handle, + subscription->implementation_identifier, eclipse_cyclonedds_identifier, + return RMW_RET_INCORRECT_RMW_IMPLEMENTATION) CddsSubscription * sub = static_cast(subscription->data); RET_NULL(sub); dds_sample_info_t info; From b69eeaab336f8637b70e33efc4ceda654a5ee376 Mon Sep 17 00:00:00 2001 From: lobotuerk Date: Fri, 18 Sep 2020 11:15:48 -0300 Subject: [PATCH 2/3] updated erros take_serialized_with_message_info Signed-off-by: lobotuerk --- rmw_cyclonedds_cpp/src/rmw_node.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp index 80f89091..f3f7433d 100644 --- a/rmw_cyclonedds_cpp/src/rmw_node.cpp +++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp @@ -2724,6 +2724,10 @@ extern "C" rmw_ret_t rmw_take_serialized_message_with_info( rmw_subscription_allocation_t * allocation) { static_cast(allocation); + + RMW_CHECK_ARGUMENT_FOR_NULL( + message_info, RMW_RET_INVALID_ARGUMENT); + return rmw_take_ser_int(subscription, serialized_message, taken, message_info); } From a3d1e605e57ac862386894d9ac95c74fb1ccb5ea Mon Sep 17 00:00:00 2001 From: lobotuerk Date: Fri, 18 Sep 2020 17:44:32 -0300 Subject: [PATCH 3/3] reviews Signed-off-by: lobotuerk --- rmw_cyclonedds_cpp/src/rmw_node.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp index f3f7433d..8ed6362b 100644 --- a/rmw_cyclonedds_cpp/src/rmw_node.cpp +++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp @@ -2639,11 +2639,11 @@ static rmw_ret_t rmw_take_ser_int( rmw_message_info_t * message_info) { RMW_CHECK_ARGUMENT_FOR_NULL( - taken, RMW_RET_INVALID_ARGUMENT); + subscription, RMW_RET_INVALID_ARGUMENT); RMW_CHECK_ARGUMENT_FOR_NULL( serialized_message, RMW_RET_INVALID_ARGUMENT); RMW_CHECK_ARGUMENT_FOR_NULL( - subscription, RMW_RET_INVALID_ARGUMENT); + taken, RMW_RET_INVALID_ARGUMENT); RMW_CHECK_TYPE_IDENTIFIERS_MATCH( subscription handle, subscription->implementation_identifier, eclipse_cyclonedds_identifier,