From 33db3053d4153a0eecb086256bb86b0e4ebf6f37 Mon Sep 17 00:00:00 2001 From: Jorge Perez Date: Fri, 14 Aug 2020 18:12:51 -0300 Subject: [PATCH 1/2] Change allocation method for copied parameter files Signed-off-by: Jorge Perez --- rcl/src/rcl/arguments.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rcl/src/rcl/arguments.c b/rcl/src/rcl/arguments.c index 4c3756073..cdfc5b453 100644 --- a/rcl/src/rcl/arguments.c +++ b/rcl/src/rcl/arguments.c @@ -886,8 +886,8 @@ rcl_arguments_copy( // Copy parameter files if (args->impl->num_param_files_args) { - args_out->impl->parameter_files = allocator.allocate( - sizeof(char *) * args->impl->num_param_files_args, allocator.state); + args_out->impl->parameter_files = allocator.zero_allocate( + args->impl->num_param_files_args, sizeof(char *), allocator.state); if (NULL == args_out->impl->parameter_files) { if (RCL_RET_OK != rcl_arguments_fini(args_out)) { RCL_SET_ERROR_MSG("Error while finalizing arguments due to another error"); From ddf38483763556cee28ce121a28a8a243b0e6d9c Mon Sep 17 00:00:00 2001 From: Jorge Perez Date: Fri, 14 Aug 2020 18:17:04 -0300 Subject: [PATCH 2/2] Add bad allocator test Signed-off-by: Jorge Perez --- rcl/test/rcl/test_arguments.cpp | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/rcl/test/rcl/test_arguments.cpp b/rcl/test/rcl/test_arguments.cpp index 81e48c212..fba50a4c4 100644 --- a/rcl/test/rcl/test_arguments.cpp +++ b/rcl/test/rcl/test_arguments.cpp @@ -1065,3 +1065,37 @@ TEST_F(CLASSNAME(TestArgumentsFixture, RMW_IMPLEMENTATION), test_bad_alloc_get_p ret = rcl_arguments_get_param_files(&parsed_args, bomb_alloc, ¶meter_files); EXPECT_EQ(RCL_RET_BAD_ALLOC, ret) << rcl_get_error_string().str; } + +TEST_F(CLASSNAME(TestArgumentsFixture, RMW_IMPLEMENTATION), test_bad_allocs_copy) { + const std::string parameters_filepath1 = (test_path / "test_parameters.1.yaml").string(); + const std::string parameters_filepath2 = (test_path / "test_parameters.2.yaml").string(); + const char * const argv[] = { + "process_name", "--ros-args", "--params-file", parameters_filepath1.c_str(), + "-r", "__ns:=/namespace", "random:=arg", "--params-file", parameters_filepath2.c_str(), + "-r", "/foo/bar:=/fiz/buz", "--remap", "foo:=/baz", + "-e", "/foo", "--", "foo" + }; + const int argc = sizeof(argv) / sizeof(const char *); + + rcl_allocator_t alloc = rcl_get_default_allocator(); + rcl_arguments_t parsed_args = rcl_get_zero_initialized_arguments(); + + rcl_ret_t ret = rcl_parse_arguments(argc, argv, alloc, &parsed_args); + ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str; + OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT( + { + EXPECT_EQ(RCL_RET_OK, rcl_arguments_fini(&parsed_args)); + }); + + rcl_arguments_t copied_args = rcl_get_zero_initialized_arguments(); + rcl_allocator_t bomb_alloc = get_time_bombed_allocator(); + rcl_allocator_t saved_alloc = parsed_args.impl->allocator; + parsed_args.impl->allocator = bomb_alloc; + for (int i = 0; i < 8; i++) { + set_time_bombed_allocator_count(bomb_alloc, i); + ret = rcl_arguments_copy(&parsed_args, &copied_args); + EXPECT_EQ(RCL_RET_BAD_ALLOC, ret) << rcl_get_error_string().str; + rcl_reset_error(); + } + parsed_args.impl->allocator = saved_alloc; +}