commit 38aa2b2ea43bafe54dc43e59d819bd8eadb2e7eb
author Ian Rogers <irogers@google.com> Wed Feb 01 11:48:16 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 01 11:48:16 2012 -0800
tree e1596c0f22398a7a272f3a17a263d2b1ca98c617
parent 5a4acce7dfe168b06d041f1faaa0bb279808700d
parent 5d86e52f93ea8d95cdda3ef45bdfc39e14e3898c

Merge "Add verifier assignability for unresolved arrays to Object[]" into dalvik-dev

src/dex_file.cc

diff --git a/src/dex_file.cc b/src/dex_file.cc
index 974f6e5..cb90e15 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -135,9 +135,16 @@
   }
   close(fd);
   const DexFile* dex_file = OpenMemory(location, map.release());
-  if (dex_file != NULL) {
-    DexFileVerifier::Verify(dex_file, dex_file->Begin(), dex_file->Size());
+  if (dex_file == NULL) {
+    LOG(ERROR) << "Failed to open dex file '" << location << "' from memory";
+    return NULL;
   }
+
+  if (!DexFileVerifier::Verify(dex_file, dex_file->Begin(), dex_file->Size())) {
+    LOG(ERROR) << "Failed to verify dex file '" << location << "'";
+    return NULL;
+  }
+
   return dex_file;
 }
 
@@ -183,9 +190,16 @@
   }
 
   const DexFile* dex_file = OpenMemory(location, map.release());
-  if (dex_file != NULL) {
-    DexFileVerifier::Verify(dex_file, dex_file->Begin(), dex_file->Size());
+  if (dex_file == NULL) {
+    LOG(ERROR) << "Failed to open dex file '" << location << "' from memory";
+    return NULL;
   }
+
+  if (!DexFileVerifier::Verify(dex_file, dex_file->Begin(), dex_file->Size())) {
+    LOG(ERROR) << "Failed to verify dex file '" << location << "'";
+    return NULL;
+  }
+
   return dex_file;
 }