commit 81f3ca17e9e8d360cc4a1b6c3155cf01ba3be3bc
author Brian Carlstrom <bdc@google.com> Sat Mar 17 00:27:35 2012 -0700
committer Brian Carlstrom <bdc@google.com> Sun Mar 18 19:45:03 2012 -0700
tree bbf93e69c7f5f29a53f12fe623486acd3a60cdd0
parent 3fa13791c51985d9956d01bc465de6d36c3390d3

Add image dependency to oat files

Change-Id: I945356f71357f1aa0092f4fe6c57eccfb029b4a6

src/oat_file.cc

diff --git a/src/oat_file.cc b/src/oat_file.cc
index f0c004d..e72944e 100644
--- a/src/oat_file.cc
+++ b/src/oat_file.cc
@@ -101,7 +101,14 @@
   const byte* oat = map->Begin();
 
   oat += sizeof(OatHeader);
-  CHECK_LE(oat, map->End()) << GetLocation();
+  oat += oat_header.GetImageFileLocationSize();
+
+  CHECK_LE(oat, map->End())
+    << reinterpret_cast<void*>(map->Begin())
+    << "+" << sizeof(OatHeader)
+    << "+" << oat_header.GetImageFileLocationSize()
+    << "<=" << reinterpret_cast<void*>(map->End())
+    << " " << GetLocation();
   for (size_t i = 0; i < oat_header.GetDexFileCount(); i++) {
     size_t dex_file_location_size = *reinterpret_cast<const uint32_t*>(oat);
     CHECK_GT(dex_file_location_size, 0U) << GetLocation();