commit c48b20611eea4d29361e83b2bcbe65eae6a655a3
author Andreas Gampe <agampe@google.com> Mon Sep 08 23:39:45 2014 -0700
committer Andreas Gampe <agampe@google.com> Tue Sep 09 01:21:14 2014 -0700
tree dd5a75a89e3b55cacb81e560077de155cf5ddbe2
parent cf254a2fcf69bdd032e4f2726fc1bd751544b0b6

ART: Better error reporting on broken oat file

Do not blow up when in GetHashBucket if GetHashBucketNum is zero.
Instead back-step to ElfFileOpen, which prints which symbol was
missing from which file.

Bug: 17422404

(cherry picked from commit 1b2140c9bf46388e4f59ecf3d62d99cd78fed12c)

Change-Id: I3b890dd1c31c08b1ccc0f7f668afcceee95f8d00

runtime/elf_file.cc

diff --git a/runtime/elf_file.cc b/runtime/elf_file.cc
index 566ce03..529cd53 100644
--- a/runtime/elf_file.cc
+++ b/runtime/elf_file.cc
@@ -584,6 +584,10 @@
 }
 
 const Elf32_Sym* ElfFile::FindDynamicSymbol(const std::string& symbol_name) const {
+  if (GetHashBucketNum() == 0) {
+    // No dynamic symbols at all.
+    return nullptr;
+  }
   Elf32_Word hash = elfhash(symbol_name.c_str());
   Elf32_Word bucket_index = hash % GetHashBucketNum();
   Elf32_Word symbol_and_chain_index = GetHashBucket(bucket_index);