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

llvm-objdump: Fix crash bug with printing unwind info on stripped file. 

The current COFF unwind printer tries to print SEH handler function names,
assuming that it can always find function names in string table. It crashes
if file being read has no symbol table (i.e. executable).

With this patch, llvm-objdump prints SEH handler's RVA if there's no symbol
table entry for that RVA.

llvm-svn: 202466
This commit is contained in:
Rui Ueyama 2014-02-28 05:21:29 +00:00
parent 1618fe25d1
commit cf39784b3a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/tools/llvm-objdump/COFFDump.cpp
View File

@ -182,10 +182,10 @@ static error_code resolveSymbol(const std::vector<RelocationRef> &Rels,
return EC;
if (Ofs == Offset) {
Sym = *I->getSymbol();
break;
return object_error::success;
}
}
return object_error::success;
return object_error::parse_failed;
}
// Given a vector of relocations for a section and an offset into this section
@ -225,11 +225,13 @@ static void printCOFFSymbolAddress(llvm::raw_ostream &Out,
const std::vector<RelocationRef> &Rels,
uint64_t Offset, uint32_t Disp) {
StringRef Sym;
if (error(resolveSymbolName(Rels, Offset, Sym)))
return;
Out << Sym;
if (Disp > 0)
Out << format(" + 0x%04x", Disp);
if (!resolveSymbolName(Rels, Offset, Sym)) {
Out << Sym;
if (Disp > 0)
Out << format(" + 0x%04x", Disp);
} else {
Out << format("0x%04x", Disp);
}
}
static void