Only call destruction_callback if non-null #24845
Conversation
In MakeSkSurfaceFromBackingStore and other places in embedder.cc, we call a texture or framebuffer destruction callback without first verifying it's non-null. This adds a check before such calls. Currently fl_renderer_gl_create_backing_store() in the Linux GTK embedder and ExternalTextureGL::PopulateTexture() in the Windows embedder either explicitly or implicitly set a null destruction callback. This prevents a crash reported when running under OpenGL ES 2.0 reported in flutter/flutter#76881. While this prevents the crash, it does not fix the underlying issue.
|
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. |
|
@chinmaygarde any suggestions on what he most straightforward way to test this might be? Most of the tests in embedder_unittests_gl.cc are a lot more involved. |
chinmaygarde
left a comment
chinmaygarde
left a comment
There was a problem hiding this comment.
Its hard to imagine when the caller might set this to nullptr as it would be a pretty massive leak. I suppose if the FBO is the default window bound framebuffer? Having a null check is fine. You can write a death test for this in embedder_unittests.
|
Yep. Noticed this in the Linux embedder initially. Looks like there may be a case in the Windows embedder as well. Both need separate fixes. |
While we no longer crash when the framebuffer destruction_callback is null (patched in #24845) we should bet setting one, even if it's a no-op containing a comment pointing to where cleanup is implemented.
In MakeSkSurfaceFromBackingStore and other places in embedder.cc, we call a texture or framebuffer destruction callback without first verifying it's non-null. This adds a check before such calls. Currently fl_renderer_gl_create_backing_store() in the Linux GTK embedder and ExternalTextureGL::PopulateTexture() in the Windows embedder either explicitly or implicitly set a null destruction callback. This prevents a crash reported when running under OpenGL ES 2.0 reported in flutter/flutter#76881. While this prevents the crash, it does not fix the underlying issue.
While we no longer crash when the framebuffer destruction_callback is null (patched in flutter#24845) we should bet setting one, even if it's a no-op containing a comment pointing to where cleanup is implemented.
In MakeSkSurfaceFromBackingStore and other places in embedder.cc, we call a texture or framebuffer destruction callback without first verifying it's non-null. This adds a check before such calls. Currently fl_renderer_gl_create_backing_store() in the Linux GTK embedder and ExternalTextureGL::PopulateTexture() in the Windows embedder either explicitly or implicitly set a null destruction callback. This prevents a crash reported when running under OpenGL ES 2.0 reported in flutter/flutter#76881. While this prevents the crash, it does not fix the underlying issue.
While we no longer crash when the framebuffer destruction_callback is null (patched in flutter#24845) we should bet setting one, even if it's a no-op containing a comment pointing to where cleanup is implemented.
3 participants
In MakeSkSurfaceFromBackingStore and other places in embedder.cc, we
call a texture or framebuffer destruction callback without first
verifying it's non-null. This adds a check before such calls.
Currently fl_renderer_gl_create_backing_store() in the Linux GTK
embedder and ExternalTextureGL::PopulateTexture() in the Windows
embedder either explicitly or implicitly set a null destruction
callback.
This prevents a crash reported when running under OpenGL ES 2.0 reported
in flutter/flutter#76881. Note that while this prevents a
crash, it does not fix the regression reported in that bug.
Pre-launch Checklist
writing and running engine tests.
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.