maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[PECOFF] Return an error_code instead of calling report_fatal_error(). 

For an invalid input we should not call report_fatal_error(), because
when LLD is used as a library, we don't want to kill the whole app
because of a malformed input.

llvm-svn: 187673
This commit is contained in:
Rui Ueyama 2013-08-02 21:10:17 +00:00
parent 9275c688ea
commit f29065d0c6
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
View File

@ -314,13 +314,17 @@ private:
/// Find the atom that is at \p targetOffset in \p section. It is assumed /// Find the atom that is at \p targetOffset in \p section. It is assumed
/// that \p atoms are sorted by position in the section. /// that \p atoms are sorted by position in the section.
COFFDefinedFileAtom * error_code findAtomAt(uint32_t targetOffset,
findAtomAt(uint32_t targetOffset, const vector<COFFDefinedFileAtom *> &atoms,
const vector<COFFDefinedFileAtom *> &atoms) const { COFFDefinedFileAtom *&result) const {
for (COFFDefinedFileAtom *atom : atoms) for (COFFDefinedFileAtom *atom : atoms) {
if (targetOffset < atom->originalOffset() + atom->size()) if (targetOffset < atom->originalOffset() + atom->size()) {
return atom; result = atom;
llvm::report_fatal_error("Relocation target out of range"); return error_code::success();
}
}
// Relocation target is out of range
return llvm::object::object_error::parse_failed;
} }
/// Find the atom for the symbol that was at the \p index in the symbol /// Find the atom for the symbol that was at the \p index in the symbol
@ -351,7 +355,9 @@ private:
if (error_code ec = getAtomBySymbolIndex(rel->SymbolTableIndex, targetAtom)) if (error_code ec = getAtomBySymbolIndex(rel->SymbolTableIndex, targetAtom))
return ec; return ec;
COFFDefinedFileAtom *atom = findAtomAt(rel->VirtualAddress, atoms); COFFDefinedFileAtom *atom;
if (error_code ec = findAtomAt(rel->VirtualAddress, atoms, atom))
return ec;
uint32_t offsetInAtom = itemAddress - atom->originalOffset(); uint32_t offsetInAtom = itemAddress - atom->originalOffset();
assert(offsetInAtom < atom->size()); assert(offsetInAtom < atom->size());
atom->addReference(std::unique_ptr<COFFReference>( atom->addReference(std::unique_ptr<COFFReference>(