-
Notifications
You must be signed in to change notification settings - Fork 117
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.
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
memory leak issue #172
Merged
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 10bfe5a
remove std::string wrapper and final nullptr setting
gaoethan d092738
add back the necessary std::string for file_path and
gaoethan bb0cef9
optimize variable scope and string converting
gaoethan 15c9c55
Make file_prefix a std::string
clalancette File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -168,14 +168,25 @@ get_security_file_paths( | |
|
||
const char * file_prefix = "file://"; | ||
|
||
std::string tmpstr; | ||
char * file_path = nullptr; | ||
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)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. While this works, it is faster to make
Once we have that, and reduce the scope of the |
||
} else { | ||
RMW_SET_ERROR_MSG("No security file found"); | ||
free(file_path); | ||
return false; | ||
} | ||
|
||
free(file_path); | ||
} | ||
|
||
return true; | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?