replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ELF: Fix dereferencing end() iterator. 

findAbsoluteAtom() returns absoluteAtom().end() if no atom is found.
Dereferencing end() value results an undefined behavior.

llvm-svn: 233765
This commit is contained in:
Rui Ueyama 2015-03-31 22:08:43 +00:00
parent 0da48b7c19
commit 6a75d842c9
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
View File

@ -30,8 +30,7 @@ public:
};
HexagonTargetLayout(HexagonLinkingContext &hti)
: TargetLayout<HexagonELFType>(hti), _sdataSection(nullptr),
_gotSymAtom(nullptr), _cachedGotSymAtom(false) {
: TargetLayout<HexagonELFType>(hti), _sdataSection() {
_sdataSection = new (_alloc) SDataSection<HexagonELFType>(hti);
}
@ -84,21 +83,19 @@ public:
}
uint64_t getGOTSymAddr() {
if (!_cachedGotSymAtom) {
auto gotAtomIter = this->findAbsoluteAtom("_GLOBAL_OFFSET_TABLE_");
_gotSymAtom = (*gotAtomIter);
_cachedGotSymAtom = true;
if (!_gotSymAtom.hasValue()) {
auto iter = this->findAbsoluteAtom("_GLOBAL_OFFSET_TABLE_");
_gotSymAtom = (iter == this->absoluteAtoms().end()) ? nullptr : *iter;
}
if (_gotSymAtom)
return _gotSymAtom->_virtualAddr;
if (*_gotSymAtom)
return (*_gotSymAtom)->_virtualAddr;
return 0;
}
private:
llvm::BumpPtrAllocator _alloc;
SDataSection<HexagonELFType> *_sdataSection;
AtomLayout *_gotSymAtom;
bool _cachedGotSymAtom;
SDataSection<HexagonELFType> *_sdataSection = nullptr;
llvm::Optional<AtomLayout *> _gotSymAtom;
};
/// \brief TargetHandler for Hexagon