MC: Don't crash when the COFF section limit is reached
I've decided not to commit a test, it takes 2.5 seconds to run on my an
incredibly strong machine.
llvm-svn: 216647
diff --git a/llvm/lib/MC/WinCOFFObjectWriter.cpp b/llvm/lib/MC/WinCOFFObjectWriter.cpp
index 824895b..2de65c7 100644
--- a/llvm/lib/MC/WinCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/WinCOFFObjectWriter.cpp
@@ -840,18 +840,23 @@
void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm,
const MCAsmLayout &Layout) {
// Assign symbol and section indexes and offsets.
- Header.NumberOfSections = 0;
+ size_t NumberOfSections = 0;
DenseMap<COFFSection *, uint16_t> SectionIndices;
- for (auto & Section : Sections) {
- size_t Number = ++Header.NumberOfSections;
- SectionIndices[Section.get()] = Number;
+ for (const auto &Section : Sections) {
+ size_t Number = ++NumberOfSections;
+ SectionIndices[Section.get()] = static_cast<uint16_t>(Number);
MakeSectionReal(*Section, Number);
}
+ if (NumberOfSections > COFF::MaxNumberOfSections)
+ report_fatal_error(
+ "PE COFF object files can't have more than 65,299 sections");
+
+ Header.NumberOfSections = static_cast<uint16_t>(NumberOfSections);
Header.NumberOfSymbols = 0;
- for (auto & Symbol : Symbols) {
+ for (auto &Symbol : Symbols) {
// Update section number & offset for symbols that have them.
if (Symbol->Section)
Symbol->Data.SectionNumber = Symbol->Section->Number;
@@ -929,7 +934,7 @@
bool RelocationsOverflow = Sec->Relocations.size() >= 0xffff;
if (RelocationsOverflow) {
- // Signal overflow by setting NumberOfSections to max value. Actual
+ // Signal overflow by setting NumberOfRelocations to max value. Actual
// size is found in reloc #0. Microsoft tools understand this.
Sec->Header.NumberOfRelocations = 0xffff;
} else {