LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-06 10:31:38 +00:00
committed by Gerrit Code Review
parent f35b6297a1 a203b62ab9
commit 3369b670ac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vndk/tools/vtable-dumper/elf_handling.cpp
View File

@@ -226,7 +226,7 @@ VTable *ELFSharedObject<ELFT>::identifyVTable(uint64_t RelOffset) {
if (It != mVTables.begin() && It->getStartAddr() != RelOffset) { if (It != mVTables.begin() && It->getStartAddr() != RelOffset) {
It--; It--;
} }
if (It->getEndAddr() >= RelOffset) { if (It->getStartAddr() <= RelOffset && It->getEndAddr() > RelOffset) {
return &(*It); return &(*It);
} }
return nullptr; return nullptr;
@@ -341,7 +341,7 @@ uint64_t ELFSharedObject<ELFT>::identifyAddend(uint64_t ROffset) {
for (const SectionRef &Section : mProgBitSectionRefs) { for (const SectionRef &Section : mProgBitSectionRefs) {
uint64_t Begin = Section.getAddress(); uint64_t Begin = Section.getAddress();
uint64_t End = Section.getAddress() + Section.getSize(); uint64_t End = Section.getAddress() + Section.getSize();
if (ROffset >= Begin && ROffset <= End) { if (ROffset >= Begin && ROffset < End) {
return getAddendFromSection(Section, ROffset - Begin); return getAddendFromSection(Section, ROffset - Begin);
} }
} }