firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Impeller] Do not capture the temporary ImpellerMapping struct pointer when storing release callbacks in libImpeller (flutter/engine#56411)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/158285
This commit is contained in:
Jason Simmons
2024-11-06 13:13:46 -08:00
committed by GitHub
parent cca1af22b2
commit 440ee21267
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/src/flutter/impeller/toolkit/interop/impeller.cc
View File

@@ -494,8 +494,9 @@ ImpellerTexture ImpellerTextureCreateWithContentsNew(
auto wrapped_contents = std::make_shared<fml::NonOwnedMapping>(
contents->data, // data ptr
contents->length, // data length
[contents, contents_on_release_user_data](auto, auto) {
contents->on_release(contents_on_release_user_data);
[on_release = contents->on_release, contents_on_release_user_data](
auto, auto) {
on_release(contents_on_release_user_data);
} // release callback
);
if (!texture->SetContents(std::move(wrapped_contents))) {
@@ -1147,8 +1148,9 @@ bool ImpellerTypographyContextRegisterFont(ImpellerTypographyContext context,
auto wrapped_contents = std::make_unique<fml::NonOwnedMapping>(
contents->data, // data ptr
contents->length, // data length
[contents, contents_on_release_user_data](auto, auto) {
contents->on_release(contents_on_release_user_data);
[on_release = contents->on_release, contents_on_release_user_data](auto,
auto) {
on_release(contents_on_release_user_data);
} // release callback
);
return GetPeer(context)->RegisterFont(std::move(wrapped_contents),