[engine] dont double free surface texture interop objects. #170284
Merged
+41
−4
Conversation
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
github-actions
bot
added
platform-android
chinmaygarde
approved these changes
Jun 9, 2025
| @@ -55,6 +55,7 @@ void SurfaceTextureExternalTextureGLImpeller::ProcessFrame( | |||
|
|
|||
| void SurfaceTextureExternalTextureGLImpeller::Detach() { | |||
| SurfaceTextureExternalTexture::Detach(); | |||
| texture_->Leak(); | |||
There was a problem hiding this comment.
Let's leave a comment mentioning the docstring saying that the detach will collect the handle.
| @@ -229,6 +230,10 @@ TextureGLES::~TextureGLES() { | |||
| } | |||
| } | |||
|
|
|||
| void TextureGLES::Leak() { | |||
| handle_ = HandleGLES::DeadHandle(); | |||
There was a problem hiding this comment.
Does ReactorGLES::CollectHandle handle a DeadHandle? We should just add an early return in that case since we'll be acquiring locks and such.
jonahwilliams
added
the
autosubmit
|
autosubmit label was removed for flutter/flutter/170284, because - The status or check suite Linux docs_test has failed. Please fix the issues identified (or deflake) before re-applying this label. |
auto-submit
bot
removed
the
autosubmit
jonahwilliams
added
the
autosubmit
auto-submit
bot
removed
the
autosubmit
|
autosubmit label was removed for flutter/flutter/170284, because - The status or check suite Linux build_android_host_app_with_module_aar has failed. Please fix the issues identified (or deflake) before re-applying this label. |
jonahwilliams
added
the
autosubmit
flutter-dashboard
bot
removed
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jun 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #152459
I suspect the double free is related to #162147 .
With the Impeller backend, the second free is performed by the reactor and comes only after the application has returned to the foreground. This increaases the likelyhood that we nuke a handle that is in active use by another part of the system.
Since SurfaceTexture:: detachFromGLContext is documented as releasing the texture, we don't need to free it at all and can "leak" it on our side.