From 9893c4773ce1da4dfb9f15140e93bf785abd89f7 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 13 Nov 2018 15:39:53 +0000 Subject: Add missed null check in ClassLoaderContext::VerifyClassLoaderContextMatch. bug: 119441748 Test: class_loader_context_test Change-Id: I68301a568eb321b42209584a3328e9a1b0fcc7ba --- runtime/class_loader_context_test.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'runtime/class_loader_context_test.cc') diff --git a/runtime/class_loader_context_test.cc b/runtime/class_loader_context_test.cc index cb3dc6506f..f3e2ac00ba 100644 --- a/runtime/class_loader_context_test.cc +++ b/runtime/class_loader_context_test.cc @@ -735,6 +735,17 @@ TEST_F(ClassLoaderContextTest, VerifyClassLoaderContextMatch) { ClassLoaderContext::VerificationResult::kMismatch); } +TEST_F(ClassLoaderContextTest, VerifyClassLoaderContextMatchSpecial) { + std::string context_spec = "&"; + std::unique_ptr context = ParseContextWithChecksums(context_spec); + // Pretend that we successfully open the dex files to pass the DCHECKS. + // (as it's much easier to test all the corner cases without relying on actual dex files). + PretendContextOpenedDexFiles(context.get()); + + ASSERT_EQ(context->VerifyClassLoaderContextMatch(context_spec), + ClassLoaderContext::VerificationResult::kForcedToSkipChecks); +} + TEST_F(ClassLoaderContextTest, VerifyClassLoaderContextMatchWithSL) { std::string context_spec = "PCL[a.dex*123:b.dex*456]{PCL[d.dex*321];PCL[e.dex*654]#PCL[f.dex*098:g.dex*999]}" -- cgit v1.2.3-59-g8ed1b