From 7409e5496974494343c752d15233affc33aa0576 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Wed, 7 Oct 2020 16:33:55 -0700 Subject: [PATCH] Avoid leaking the FlutterEngineAOTData structure in FlutterEngineCollectAOTData. Fixes https://github.com/flutter/flutter/issues/67554 --- shell/platform/embedder/embedder.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc index 506a5418cff27..971ef22024f59 100644 --- a/shell/platform/embedder/embedder.cc +++ b/shell/platform/embedder/embedder.cc @@ -651,13 +651,13 @@ FlutterEngineResult FlutterEngineCreateAOTData( } FlutterEngineResult FlutterEngineCollectAOTData(FlutterEngineAOTData data) { - if (data) { - data->loaded_elf = nullptr; - data->vm_snapshot_data = nullptr; - data->vm_snapshot_instrs = nullptr; - data->vm_isolate_data = nullptr; - data->vm_isolate_instrs = nullptr; + if (!data) { + // Deleting a null object should be a no-op. + return kSuccess; } + + // Created in a unique pointer in `FlutterEngineCreateAOTData`. + delete data; return kSuccess; }