From 637c392d1c1ab10dd25426212674c771f65bb4bb Mon Sep 17 00:00:00 2001 From: "ted.mielczarek@gmail.com" Date: Fri, 29 Mar 2013 15:06:29 +0000 Subject: Defer adding sections until ELF::Finish in synth_elf A=Mike Hommey R=ted at https://breakpad.appspot.com/543002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1135 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/linux/synth_elf.cc | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/common/linux/synth_elf.cc') diff --git a/src/common/linux/synth_elf.cc b/src/common/linux/synth_elf.cc index afaea022..66ba60a3 100644 --- a/src/common/linux/synth_elf.cc +++ b/src/common/linux/synth_elf.cc @@ -115,18 +115,22 @@ int ELF::AddSection(const string& name, const Section& section, // sh_entsize .Append(endianness(), addr_size_, entsize); + sections_.push_back(ElfSection(section, type, offset, offset_label)); + return index; +} + +void ELF::AppendSection(ElfSection §ion) { // NULL and NOBITS sections have no content, so they // don't need to be written to the file. - if (type == SHT_NULL) { - offset_label = 0; - } else if (type == SHT_NOBITS) { - offset_label = offset; + if (section.type_ == SHT_NULL) { + section.offset_label_ = 0; + } else if (section.type_ == SHT_NOBITS) { + section.offset_label_ = section.offset_; } else { - Mark(&offset_label); + Mark(§ion.offset_label_); Append(section); Align(4); } - return index; } void ELF::Finish() { @@ -136,6 +140,10 @@ void ELF::Finish() { AddSection(".shstrtab", section_header_strings_, SHT_STRTAB); //printf("section_count_: %ld, sections_.size(): %ld\n", // section_count_, sections_.size()); + for (vector::iterator it = sections_.begin(); + it < sections_.end(); ++it) { + AppendSection(*it); + } section_count_label_ = section_count_; program_count_label_ = program_count_; // TODO: allow adding entries to program header table -- cgit v1.2.1