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.

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

fix leak of DisplayList storage #28158

Merged
merged 1 commit into from
Aug 18, 2021

Conversation

flar
Copy link
Contributor

@flar flar commented Aug 18, 2021

Switch to a unique_ptr to ensure that the memory is freed. The type used here for DisplayList::storage_ here is taken from the internal memory holder of the SkAutoTMalloc that was used to allocate and grow the array. SkAutoTMalloc manages a pointer that should be freed with sk_free (which is just a null protected wrapper around free).

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

if (ptr_ == other.ptr_) {
uint8_t* ptr = storage_.get();
uint8_t* o_ptr = other.storage_.get();
if (ptr == o_ptr) {
Copy link
Member

Choose a reason for hiding this comment

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

I believe you should be able to compare the unique_ptrs directly.

if (storage_ == other.storage_) {
  ...
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need them anyway for the next step.

@flar
Copy link
Contributor Author

flar commented Aug 18, 2021

The tests should be taken care of when we add leak detection to the unit tests.

@flar flar added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label Aug 18, 2021
@fluttergithubbot fluttergithubbot merged commit 6a49cee into flutter:master Aug 18, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 18, 2021
chriscraws pushed a commit to chriscraws/engine that referenced this pull request Aug 23, 2021
yx-mike added a commit to yx-mike/engine that referenced this pull request Dec 31, 2021
filmil pushed a commit to filmil/engine that referenced this pull request Apr 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes needs tests waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants