commit 98725444129efe2b1b51c87740860caadaef2bf7
author Brian Carlstrom <bdc@google.com> Sun May 25 16:08:51 2014 -0700
committer Brian Carlstrom <bdc@google.com> Sun May 25 17:24:44 2014 -0700
tree 9757154f39bbe9c1eb96d160e4d67021fbdbb1bc
parent d3314e1c439bc7a4e9953f14bad597f435aa1d43

Make DexFile content read only before running DexFileVerifier

Change-Id: I806d08112cdc5a79e91c97991fff02686a5f9784

runtime/dex_file.cc

diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc
index 9cb2f1b..3ff55ab 100644
--- a/runtime/dex_file.cc
+++ b/runtime/dex_file.cc
@@ -258,15 +258,15 @@
                               error_msg->c_str());
     return nullptr;
   }
-  if (!DexFileVerifier::Verify(dex_file.get(), dex_file->Begin(), dex_file->Size(),
-                               location.c_str(), error_msg)) {
-    return nullptr;
-  }
   if (!dex_file->DisableWrite()) {
     *error_msg = StringPrintf("Failed to make dex file '%s' read only", location.c_str());
     return nullptr;
   }
   CHECK(dex_file->IsReadOnly()) << location;
+  if (!DexFileVerifier::Verify(dex_file.get(), dex_file->Begin(), dex_file->Size(),
+                               location.c_str(), error_msg)) {
+    return nullptr;
+  }
   return dex_file.release();
 }