Merge "Fix vtable boundary check in vndk-vtable-dumper"

aosp-mirror · Jul 6, 2018 · 3369b67 · 3369b67
2 parents f35b629 + a203b62
commit 3369b67
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/vndk/tools/vtable-dumper/elf_handling.cpp b/vndk/tools/vtable-dumper/elf_handling.cpp
@@ -226,7 +226,7 @@ VTable *ELFSharedObject<ELFT>::identifyVTable(uint64_t RelOffset) {
     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 @@ uint64_t ELFSharedObject<ELFT>::identifyAddend(uint64_t ROffset) {
     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);
         }
     }