From 405fc31b440b72ba647deca2790fd72e757dc1c4 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Tue, 14 Aug 2018 15:09:17 -0700 Subject: [PATCH 1/3] initialize memory before sending a message --- rcl/test/rcl/client_fixture.cpp | 2 ++ rcl/test/rcl/service_fixture.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/rcl/test/rcl/client_fixture.cpp b/rcl/test/rcl/client_fixture.cpp index 992f03917..28079b84f 100644 --- a/rcl/test/rcl/client_fixture.cpp +++ b/rcl/test/rcl/client_fixture.cpp @@ -158,6 +158,7 @@ int main(int argc, char ** argv) // Initialize a request. test_msgs__srv__Primitives_Request client_request; + memset(&client_request, 0, sizeof(test_msgs__srv__Primitives_Request)); test_msgs__srv__Primitives_Request__init(&client_request); client_request.uint8_value = 1; client_request.uint32_value = 2; @@ -178,6 +179,7 @@ int main(int argc, char ** argv) // Initialize the response owned by the client and take the response. test_msgs__srv__Primitives_Response client_response; + memset(&client_response, 0, sizeof(test_msgs__srv__Primitives_Response)); test_msgs__srv__Primitives_Response__init(&client_response); if (!wait_for_client_to_be_ready(&client, 1000, 100)) { diff --git a/rcl/test/rcl/service_fixture.cpp b/rcl/test/rcl/service_fixture.cpp index db16e77a4..f92d6114a 100644 --- a/rcl/test/rcl/service_fixture.cpp +++ b/rcl/test/rcl/service_fixture.cpp @@ -125,6 +125,7 @@ int main(int argc, char ** argv) // Initialize a response. test_msgs__srv__Primitives_Response service_response; + memset(&service_response, 0, sizeof(test_msgs__srv__Primitives_Response)); test_msgs__srv__Primitives_Response__init(&service_response); OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ test_msgs__srv__Primitives_Response__fini(&service_response); @@ -139,6 +140,7 @@ int main(int argc, char ** argv) // Take the pending request. test_msgs__srv__Primitives_Request service_request; + memset(&service_request, 0, sizeof(test_msgs__srv__Primitives_Request)); test_msgs__srv__Primitives_Request__init(&service_request); OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ test_msgs__srv__Primitives_Request__fini(&service_request); From 84892ec927575a87d7e5a1fb883886b35fdb249e Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Tue, 14 Aug 2018 16:37:43 -0700 Subject: [PATCH 2/3] add todo referencing ticket --- rcl/test/rcl/client_fixture.cpp | 2 ++ rcl/test/rcl/service_fixture.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/rcl/test/rcl/client_fixture.cpp b/rcl/test/rcl/client_fixture.cpp index 28079b84f..9a2c1c603 100644 --- a/rcl/test/rcl/client_fixture.cpp +++ b/rcl/test/rcl/client_fixture.cpp @@ -158,6 +158,7 @@ int main(int argc, char ** argv) // Initialize a request. test_msgs__srv__Primitives_Request client_request; + // TODO zero initialization necessary until https://github.com/ros2/ros2/issues/397 is implemented memset(&client_request, 0, sizeof(test_msgs__srv__Primitives_Request)); test_msgs__srv__Primitives_Request__init(&client_request); client_request.uint8_value = 1; @@ -179,6 +180,7 @@ int main(int argc, char ** argv) // Initialize the response owned by the client and take the response. test_msgs__srv__Primitives_Response client_response; + // TODO zero initialization necessary until https://github.com/ros2/ros2/issues/397 is implemented memset(&client_response, 0, sizeof(test_msgs__srv__Primitives_Response)); test_msgs__srv__Primitives_Response__init(&client_response); diff --git a/rcl/test/rcl/service_fixture.cpp b/rcl/test/rcl/service_fixture.cpp index f92d6114a..5a6767fc2 100644 --- a/rcl/test/rcl/service_fixture.cpp +++ b/rcl/test/rcl/service_fixture.cpp @@ -125,6 +125,7 @@ int main(int argc, char ** argv) // Initialize a response. test_msgs__srv__Primitives_Response service_response; + // TODO zero initialization necessary until https://github.com/ros2/ros2/issues/397 is implemented memset(&service_response, 0, sizeof(test_msgs__srv__Primitives_Response)); test_msgs__srv__Primitives_Response__init(&service_response); OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ @@ -140,6 +141,7 @@ int main(int argc, char ** argv) // Take the pending request. test_msgs__srv__Primitives_Request service_request; + // TODO zero initialization necessary until https://github.com/ros2/ros2/issues/397 is implemented memset(&service_request, 0, sizeof(test_msgs__srv__Primitives_Request)); test_msgs__srv__Primitives_Request__init(&service_request); OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ From e322f7daa8c2e74fc8402f45c1bc80aa790c3bd3 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Tue, 14 Aug 2018 16:43:56 -0700 Subject: [PATCH 3/3] wrap todo --- rcl/test/rcl/client_fixture.cpp | 6 ++++-- rcl/test/rcl/service_fixture.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rcl/test/rcl/client_fixture.cpp b/rcl/test/rcl/client_fixture.cpp index 9a2c1c603..d5249cda3 100644 --- a/rcl/test/rcl/client_fixture.cpp +++ b/rcl/test/rcl/client_fixture.cpp @@ -158,7 +158,8 @@ int main(int argc, char ** argv) // Initialize a request. test_msgs__srv__Primitives_Request client_request; - // TODO zero initialization necessary until https://github.com/ros2/ros2/issues/397 is implemented + // TODO(dirk-thomas) zero initialization necessary until + // https://github.com/ros2/ros2/issues/397 is implemented memset(&client_request, 0, sizeof(test_msgs__srv__Primitives_Request)); test_msgs__srv__Primitives_Request__init(&client_request); client_request.uint8_value = 1; @@ -180,7 +181,8 @@ int main(int argc, char ** argv) // Initialize the response owned by the client and take the response. test_msgs__srv__Primitives_Response client_response; - // TODO zero initialization necessary until https://github.com/ros2/ros2/issues/397 is implemented + // TODO(dirk-thomas) zero initialization necessary until + // https://github.com/ros2/ros2/issues/397 is implemented memset(&client_response, 0, sizeof(test_msgs__srv__Primitives_Response)); test_msgs__srv__Primitives_Response__init(&client_response); diff --git a/rcl/test/rcl/service_fixture.cpp b/rcl/test/rcl/service_fixture.cpp index 5a6767fc2..d3d2e0962 100644 --- a/rcl/test/rcl/service_fixture.cpp +++ b/rcl/test/rcl/service_fixture.cpp @@ -125,7 +125,8 @@ int main(int argc, char ** argv) // Initialize a response. test_msgs__srv__Primitives_Response service_response; - // TODO zero initialization necessary until https://github.com/ros2/ros2/issues/397 is implemented + // TODO(dirk-thomas) zero initialization necessary until + // https://github.com/ros2/ros2/issues/397 is implemented memset(&service_response, 0, sizeof(test_msgs__srv__Primitives_Response)); test_msgs__srv__Primitives_Response__init(&service_response); OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({ @@ -141,7 +142,8 @@ int main(int argc, char ** argv) // Take the pending request. test_msgs__srv__Primitives_Request service_request; - // TODO zero initialization necessary until https://github.com/ros2/ros2/issues/397 is implemented + // TODO(dirk-thomas) zero initialization necessary until + // https://github.com/ros2/ros2/issues/397 is implemented memset(&service_request, 0, sizeof(test_msgs__srv__Primitives_Request)); test_msgs__srv__Primitives_Request__init(&service_request); OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({