Repository navigation
v3.2.x: Fix leaks in C++ code - #17468
Merged
tacaswell merged 3 commits intoMay 21, 2020
Merged
tacaswell merged 3 commits into
tacaswell merged 3 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
tacaswell
approved these changes
May 21, 2020
WeatherGod
reviewed
May 21, 2020
Comment thread
src/_png.cpp
| PyObject *meta_key, *meta_val; | ||
| Py_ssize_t pos = 0; | ||
| int meta_pos = 0; | ||
| std::vector<PyObject*> temp_strs; |
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
don't know if it is worth it, but when doing push_back()s to a vector, one can save a fair amount of memory and allocation time by doing temp_strs.reserve(meta_size); before the loop for strings since we know the upper limit for this vector.
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
There was a problem hiding this comment.
I expect it won't be more than 10 or maybe 20, but I've added it since we do know the limit.
Sorry, something went wrong.
WeatherGod
approved these changes
May 21, 2020
WeatherGod
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
seems to make sense to me.
Sorry, something went wrong.
If `info_ptr` isn't created, we should still destroy `png_ptr`.
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
3 participants
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.
PR Summary
This is a cherry-pick of the leak fix in #17458, and another leak fix in the png code (which doesn't exist on master.)
PR Checklist