commit 8d02644a351ab4b868a04b0ff39727cb83f06d8c
author Roland Levillain <rpl@google.com> Tue Jan 19 17:30:33 2016 +0000
committer Roland Levillain <rpl@google.com> Tue Jan 19 17:30:33 2016 +0000
tree 1358b39e029a732ea748e3478edb0cddfd24912e
parent a27d59b2b98a02b2e9e5dbe40623e7a97aa1e8d8

mem_map_test: perform null check before dereferencing a pointer.

Bug: 26635783
Change-Id: I0bd29445b322b4c16b4f85a5acd9fac403d4fb6b

runtime/mem_map_test.cc

diff --git a/runtime/mem_map_test.cc b/runtime/mem_map_test.cc
index edcbcf2..2f903c8 100644
--- a/runtime/mem_map_test.cc
+++ b/runtime/mem_map_test.cc
@@ -271,8 +271,8 @@
         break;
       }
     }
-    ASSERT_GE(reinterpret_cast<uintptr_t>(map->End()), 2u * GB);
     ASSERT_TRUE(map.get() != nullptr) << error_msg;
+    ASSERT_GE(reinterpret_cast<uintptr_t>(map->End()), 2u * GB);
     ASSERT_TRUE(error_msg.empty());
     ASSERT_EQ(BaseBegin(map.get()), reinterpret_cast<void*>(start_addr));
   }