commit 532d1aa70f8c4f70460f9a3d97fa7e6ccad035b7
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 06 10:38:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 06 10:38:18 2018 +0000
tree 4604fc919e943015c3d6a7fc72b257a572a353c6
parent 3369b670acfefbe90a288c0a285a87858c0e2198
parent 502af5c406a2fbcff0a505198b6accc54782ef77

Merge "vtable-dumper: Add loganchien to OWNERS"

vndk/tools/vtable-dumper/elf_handling.cpp

diff --git a/vndk/tools/vtable-dumper/elf_handling.cpp b/vndk/tools/vtable-dumper/elf_handling.cpp
index e0483db..4e09a88 100644
--- a/vndk/tools/vtable-dumper/elf_handling.cpp
+++ b/vndk/tools/vtable-dumper/elf_handling.cpp
@@ -226,7 +226,7 @@
     if (It != mVTables.begin() && It->getStartAddr() != RelOffset) {
         It--;
     }
-    if (It->getEndAddr() >= RelOffset) {
+    if (It->getStartAddr() <= RelOffset && It->getEndAddr() > RelOffset) {
         return &(*It);
     }
     return nullptr;
@@ -341,7 +341,7 @@
     for (const SectionRef &Section : mProgBitSectionRefs) {
         uint64_t Begin = Section.getAddress();
         uint64_t End = Section.getAddress() + Section.getSize();
-        if (ROffset >= Begin && ROffset <= End) {
+        if (ROffset >= Begin && ROffset < End) {
             return getAddendFromSection(Section, ROffset - Begin);
         }
     }