Fix possible overrun bug for resolving startup strings
Moved the ResolveConstStrings after verification and added logic to
only resolve strings for classes that verify. This fixes a bug
where invalid Dex bytecode could cause dex2oat to crash.
Bug: 128915540
Test: test-art-host
Change-Id: Id2e5e4b10e5afbb8955e805d199754bc255a2f42
diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index ed74947..8e3e73f 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -441,15 +441,19 @@
return dex_files;
}
+std::unique_ptr<const DexFile> CommonArtTestImpl::OpenDexFile(const char* filename) {
+ std::vector<std::unique_ptr<const DexFile>> dex_files(OpenDexFiles(filename));
+ CHECK_EQ(dex_files.size(), 1u) << "Expected only one dex file";
+ return std::move(dex_files[0]);
+}
+
std::vector<std::unique_ptr<const DexFile>> CommonArtTestImpl::OpenTestDexFiles(
const char* name) {
return OpenDexFiles(GetTestDexFileName(name).c_str());
}
std::unique_ptr<const DexFile> CommonArtTestImpl::OpenTestDexFile(const char* name) {
- std::vector<std::unique_ptr<const DexFile>> vector = OpenTestDexFiles(name);
- EXPECT_EQ(1U, vector.size());
- return std::move(vector[0]);
+ return OpenDexFile(GetTestDexFileName(name).c_str());
}
std::string CommonArtTestImpl::GetCoreFileLocation(const char* suffix) {