Skip to content

Commit 48276b6

Browse files
chinmaygardegspencergoog
authored andcommitted
Avoid leaking the FlutterEngineAOTData structure in FlutterEngineCollectAOTData. (flutter#21680)
1 parent 79e2390 commit 48276b6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

shell/platform/embedder/embedder.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -651,13 +651,13 @@ FlutterEngineResult FlutterEngineCreateAOTData(
651651
}
652652

653653
FlutterEngineResult FlutterEngineCollectAOTData(FlutterEngineAOTData data) {
654-
if (data) {
655-
data->loaded_elf = nullptr;
656-
data->vm_snapshot_data = nullptr;
657-
data->vm_snapshot_instrs = nullptr;
658-
data->vm_isolate_data = nullptr;
659-
data->vm_isolate_instrs = nullptr;
654+
if (!data) {
655+
// Deleting a null object should be a no-op.
656+
return kSuccess;
660657
}
658+
659+
// Created in a unique pointer in `FlutterEngineCreateAOTData`.
660+
delete data;
661661
return kSuccess;
662662
}
663663

0 commit comments

Comments
 (0)