From 8d63875c54e54fa171c2fbe9ff5611d57d334875 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 23 Jun 2009 07:19:35 +0000 Subject: [PATCH] PR 10147 * object.cc (Object::section_contents): Don't try to get a view if the section has length zero. (Object::handle_gnu_warning_section): If the section is empty, use the name of the section as the warning. --- gold/ChangeLog | 8 ++++++++ gold/object.cc | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/gold/ChangeLog b/gold/ChangeLog index c62aa99fdf5..b4d7ee6297d 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,11 @@ +2009-06-23 Ian Lance Taylor + + PR 10147 + * object.cc (Object::section_contents): Don't try to get a view if + the section has length zero. + (Object::handle_gnu_warning_section): If the section is empty, use + the name of the section as the warning. + 2009-06-23 Ian Lance Taylor PR 10133 diff --git a/gold/object.cc b/gold/object.cc index c3c9c7bcf45..75e5a2efe4b 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -170,6 +170,11 @@ Object::section_contents(unsigned int shndx, section_size_type* plen, { Location loc(this->do_section_contents(shndx)); *plen = convert_to_section_size_type(loc.data_size); + if (*plen == 0) + { + static const unsigned char empty[1] = { '\0' }; + return empty; + } return this->get_view(loc.file_offset, *plen, true, cache); } @@ -226,6 +231,12 @@ Object::handle_gnu_warning_section(const char* name, unsigned int shndx, section_size_type len; const unsigned char* contents = this->section_contents(shndx, &len, false); + if (len == 0) + { + const char* warning = name + warn_prefix_len; + contents = reinterpret_cast(warning); + len = strlen(warning); + } std::string warning(reinterpret_cast(contents), len); symtab->add_warning(name + warn_prefix_len, this, warning); return true; -- 2.30.2