commit 4568f4bc0f116f097a13b1d931de93cf525ae204
author Christopher Ferris <cferris@google.com> Tue Oct 23 17:42:41 2018 -0700
committer Christopher Ferris <cferris@google.com> Mon Oct 29 18:08:09 2018 -0700
tree 2832d853a8b2dfa6f66f1c5d04d22df742b22d4d
parent 2a8460721ca219ea2d9bc00e0412297afd12df47

Verify that the elf matches the expected arch.

To avoid a case where a malicious app might try and trick the system to
create an elf and register object that mismatches, always verify that they
are the same arch.

Test: Ran unit tests.
Change-Id: I66978e9e02f8e4f396856912e7019528ead4838e

libunwindstack/DexFiles.cpp

diff --git a/libunwindstack/DexFiles.cpp b/libunwindstack/DexFiles.cpp
index ac55fee..451a0b9 100644
--- a/libunwindstack/DexFiles.cpp
+++ b/libunwindstack/DexFiles.cpp
@@ -54,8 +54,8 @@
   }
 }
 
-void DexFiles::SetArch(ArchEnum arch) {
-  switch (arch) {
+void DexFiles::ProcessArch() {
+  switch (arch()) {
     case ARCH_ARM:
     case ARCH_MIPS:
     case ARCH_X86: