This is an archive of the discontinued LLVM Phabricator instance.

[obj2yaml] Don't crash for input files without symbol table
ClosedPublic

Authored by arichardson on Sep 20 2017, 6:41 AM.

Download Raw Diff

Details

Reviewers

davide
atanasyan
• rafael

Commits

rGc46750ef42dd: [obj2yaml] Don't crash for input files without symbol table
rL313970: [obj2yaml] Don't crash for input files without symbol table

Summary

Previously we would dereference Symtab without checking for null.

Diff Detail

Repository: rL LLVM

Event Timeline

arichardson created this revision.Sep 20 2017, 6:41 AM

LGTM

This revision is now accepted and ready to land.Sep 20 2017, 7:05 AM

lgtm

Closed by commit rL313970: [obj2yaml] Don't crash for input files without symbol table (authored by arichardson). · Explain WhySep 22 2017, 2:32 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

llvm/

trunk/

test/

tools/

obj2yaml/

Inputs/

crt1.o

missing_symtab.test

5 lines

tools/

obj2yaml/

elf2yaml.cpp

2 lines

Diff 116316

llvm/trunk/test/tools/obj2yaml/Inputs/crt1.o

This is a binary file.

Property	Old Value	New Value
svn:executable	null	* \ No newline at end of property

llvm/trunk/test/tools/obj2yaml/missing_symtab.test

				# RUN: obj2yaml %S/Inputs/crt1.o \| FileCheck %s
				# test that we don't crash when passed object files without a symbol table
				# CHECK-LABEL: FileHeader:
				# CHECK-LABEL: Sections:
				# CHECK-LABEL: Symbols:

llvm/trunk/tools/obj2yaml/elf2yaml.cpp

Show First 20 Lines • Show All 182 Lines • ▼ Show 20 Lines	default: {
if (std::error_code EC = S.getError())		if (std::error_code EC = S.getError())
return EC;		return EC;
Y->Sections.push_back(std::unique_ptr<ELFYAML::Section>(S.get()));		Y->Sections.push_back(std::unique_ptr<ELFYAML::Section>(S.get()));
}		}
}		}
}		}

// Dump symbols		// Dump symbols
		if (!Symtab)
		return Y.release(); // if the symbol table is missing return early
auto StrTableOrErr = Obj.getStringTableForSymtab(*Symtab);		auto StrTableOrErr = Obj.getStringTableForSymtab(*Symtab);
if (!StrTableOrErr)		if (!StrTableOrErr)
return errorToErrorCode(StrTableOrErr.takeError());		return errorToErrorCode(StrTableOrErr.takeError());
StringRef StrTable = *StrTableOrErr;		StringRef StrTable = *StrTableOrErr;

bool IsFirstSym = true;		bool IsFirstSym = true;
auto SymtabOrErr = Obj.symbols(Symtab);		auto SymtabOrErr = Obj.symbols(Symtab);
if (!SymtabOrErr)		if (!SymtabOrErr)
▲ Show 20 Lines • Show All 332 Lines • Show Last 20 Lines