Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

memory leak issue #172

Merged
merged 5 commits into from
Nov 7, 2017
Merged

memory leak issue #172

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
566e862
* Memory leak issue
gaoethan Nov 1, 2017
10bfe5a
remove std::string wrapper and final nullptr setting
gaoethan Nov 1, 2017
d092738
add back the necessary std::string for file_path and
gaoethan Nov 2, 2017
bb0cef9
optimize variable scope and string converting
gaoethan Nov 7, 2017
15c9c55
Make file_prefix a std::string
clalancette Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions rmw_fastrtps_cpp/src/rmw_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,25 @@ get_security_file_paths(

const char * file_prefix = "file://";

std::string tmpstr;
char * file_path = nullptr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you not reduce the scope of the variable to within the for loop?

for (size_t i = 0; i < num_files; i++) {
tmpstr = std::string(rcutils_join_path(node_secure_root, file_names[i]));
if (!rcutils_is_readable(tmpstr.c_str())) {
file_path = rcutils_join_path(node_secure_root, file_names[i]);
if (!file_path) {
RMW_SET_ERROR_MSG("Failed to allocate memory for security file path");
return false;
}
security_files_paths[i] = std::string(file_prefix + tmpstr);

if (rcutils_is_readable(file_path)) {
security_files_paths[i] = std::string(file_prefix + std::string(file_path));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While this works, it is faster to make file_prefix above a std::string (like std::string file_prefix("file://");, and then here, do:

security_file_paths[i] = file_prefix + std::string(file_path);

Once we have that, and reduce the scope of the file_path like @wjwwood suggested, I think this will be ready to go.

} else {
RMW_SET_ERROR_MSG("No security file found");
free(file_path);
return false;
}

free(file_path);
}

return true;
}

Expand Down