commit e16c3bf54c0667a60d681f7df59ba22bcffa3774
author Steven Moreland <smoreland@google.com> Wed May 24 09:12:32 2017 -0700
committer Steven Moreland <smoreland@google.com> Thu May 25 16:28:57 2017 +0000
tree 903e7f2391472a4b3972dca65332baaae039de3a
parent 60b2489f32e514326471fd226f461ef86985d8fa

Remove segfault.

Test: (sanity) boot device internally
Test: m -j test-art-host
Change-Id: Ida4f5ac506268af4b0a95ffad10438496340f094

runtime/elf_file.cc

diff --git a/runtime/elf_file.cc b/runtime/elf_file.cc
index 5fbdc46..afe4eeb 100644
--- a/runtime/elf_file.cc
+++ b/runtime/elf_file.cc
@@ -1698,7 +1698,7 @@
                                               low_4gb,
                                               file->GetPath().c_str(),
                                               error_msg));
-  if (map == nullptr && map->Size() != EI_NIDENT) {
+  if (map == nullptr || map->Size() != EI_NIDENT) {
     return nullptr;
   }
   uint8_t* header = map->Begin();
@@ -1749,7 +1749,7 @@
                                               low_4gb,
                                               file->GetPath().c_str(),
                                               error_msg));
-  if (map == nullptr && map->Size() != EI_NIDENT) {
+  if (map == nullptr || map->Size() != EI_NIDENT) {
     return nullptr;
   }
   uint8_t* header = map->Begin();