From a7b7de59e0a9e880cc7b5dcd4f2693825b9f3e25 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 23 Mar 2020 17:11:22 -0700 Subject: [PATCH] Fix idmap2 uninitialized variables Some primitives were not initialized to a default value causing --ignore-overlayable and --verbose to default to true. Bug: 148181123 Test: idmap2_tests Change-Id: If87ba76b7d24803f46b71ef36befa12f25916680 Merged-In: Ic9dbd3e9a768beb39ac677ff294b0fca5ee8f9d2 --- cmds/idmap2/idmap2/Create.cpp | 2 +- cmds/idmap2/idmap2/Dump.cpp | 2 +- cmds/idmap2/tests/Idmap2BinaryTests.cpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmds/idmap2/idmap2/Create.cpp b/cmds/idmap2/idmap2/Create.cpp index bb8d927375634..f482191b09a81 100644 --- a/cmds/idmap2/idmap2/Create.cpp +++ b/cmds/idmap2/idmap2/Create.cpp @@ -50,7 +50,7 @@ Result Create(const std::vector& args) { std::string overlay_apk_path; std::string idmap_path; std::vector policies; - bool ignore_overlayable; + bool ignore_overlayable = false; const CommandLineOptions opts = CommandLineOptions("idmap2 create") diff --git a/cmds/idmap2/idmap2/Dump.cpp b/cmds/idmap2/idmap2/Dump.cpp index 8716bf313ed00..47f442aab2358 100644 --- a/cmds/idmap2/idmap2/Dump.cpp +++ b/cmds/idmap2/idmap2/Dump.cpp @@ -39,7 +39,7 @@ using android::idmap2::Unit; Result Dump(const std::vector& args) { SYSTRACE << "Dump " << args; std::string idmap_path; - bool verbose; + bool verbose = false; const CommandLineOptions opts = CommandLineOptions("idmap2 dump") diff --git a/cmds/idmap2/tests/Idmap2BinaryTests.cpp b/cmds/idmap2/tests/Idmap2BinaryTests.cpp index 8a48f4b8e6d5d..499eb99af2908 100644 --- a/cmds/idmap2/tests/Idmap2BinaryTests.cpp +++ b/cmds/idmap2/tests/Idmap2BinaryTests.cpp @@ -131,7 +131,6 @@ TEST_F(Idmap2BinaryTests, Dump) { ASSERT_NE(result->stdout.find("0x7f02000c -> 0x7f020000 string/str1"), std::string::npos); ASSERT_NE(result->stdout.find("0x7f02000e -> 0x7f020001 string/str3"), std::string::npos); ASSERT_NE(result->stdout.find("0x7f02000f -> 0x7f020002 string/str4"), std::string::npos); - ASSERT_EQ(result->stdout.find("00000210: 007f target package id"), std::string::npos); // clang-format off result = ExecuteBinary({"idmap2",