commit 2a530564d39aae5625874b8072b67c0598689ff7
author Mathieu Chartier <mathieuc@google.com> Tue Aug 04 16:56:18 2020 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Aug 05 17:00:45 2020 +0000
tree 0d415f3ee688bfce8ff162bf5d985c13bc8d6540
parent b96d6f3846103659249ad58fc905fc5a14dafc47

Check void pointer instead of uint8_t

Avoid trying to print the addresses as a string if the check fails.

Test: make
Bug: 160067357
Change-Id: I0de5ec4ed7189d7ec3b4e3cac2758d214e1f27b1

runtime/oat_file.cc

diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index d8ef21d..7a89abe 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -1972,7 +1972,8 @@
   uint32_t oat_class_offset = GetOatClassOffset(class_def_index);
 
   const uint8_t* oat_class_pointer = oat_file_->Begin() + oat_class_offset;
-  CHECK_LT(oat_class_pointer, oat_file_->End()) << oat_file_->GetLocation();
+  CHECK_LT(reinterpret_cast<const void*>(oat_class_pointer),
+           reinterpret_cast<const void*>(oat_file_->End())) << oat_file_->GetLocation();
 
   const uint8_t* status_pointer = oat_class_pointer;
   CHECK_LT(status_pointer, oat_file_->End()) << oat_file_->GetLocation();