commit ecfd0df971c538456887866307c007c8b0a25470
author Roland Levillain <rpl@google.com> Tue Jan 19 18:18:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 19 18:18:24 2016 +0000
tree ea23e65ae87c73dacfa3fdd474150d549b2bfc0f
parent c31fb58453ec1eba82390c3313623d37314c5490
parent 8d02644a351ab4b868a04b0ff39727cb83f06d8c

Merge "mem_map_test: perform null check before dereferencing a pointer."

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));
   }