From ac55e41f24df1bc5759eeb5fba8b6afbe6f71f04 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Tue, 24 Sep 2019 16:26:20 -0700 Subject: Fix memory leak in aapt2 Fix a memory leak in Main.cpp. Bug: 141312058 Test: m -j aapt2 SANITIZE_TARGET=address Change-Id: I54b61792ab75e2f59298dd38168653e496c84bff --- tools/aapt2/Main.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tools/aapt2/Main.cpp') diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp index 7966ba27ebd8..8a43bb4ede35 100644 --- a/tools/aapt2/Main.cpp +++ b/tools/aapt2/Main.cpp @@ -169,17 +169,12 @@ int MainImpl(int argc, char** argv) { aapt::text::Printer printer(&fout); aapt::StdErrDiagnostics diagnostics; - auto main_command = new aapt::MainCommand(&printer, &diagnostics); + aapt::MainCommand main_command(&printer, &diagnostics); // Add the daemon subcommand here so it cannot be called while executing the daemon - main_command->AddOptionalSubcommand( + main_command.AddOptionalSubcommand( aapt::util::make_unique(&fout, &diagnostics)); - return main_command->Execute(args, &std::cerr); -} - -// TODO(b/141312058) stop leaks -extern "C" const char *__asan_default_options() { - return "detect_leaks=0"; + return main_command.Execute(args, &std::cerr); } int main(int argc, char** argv) { -- cgit v1.2.3-59-g8ed1b