diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/binary.cc | 17 |
2 files changed, 17 insertions, 5 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 63190c7..9e8617b 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2011-05-29 Ian Lance Taylor <iant@google.com> + + * binary.cc (Binary_to_elf::sized_convert): Don't crash if the + binary input file is empty. + 2011-05-27 Ian Lance Taylor <iant@google.com> * testsuite/Makefile.am (ver_test_2.so): Use -Wl,-R,. diff --git a/gold/binary.cc b/gold/binary.cc index f14df0d..6cc99a9 100644 --- a/gold/binary.cc +++ b/gold/binary.cc @@ -132,7 +132,11 @@ Binary_to_elf::sized_convert(const Task* task) } section_size_type filesize = convert_to_section_size_type(f.filesize()); - const unsigned char* fileview = f.get_view(0, 0, filesize, false, false); + const unsigned char* fileview; + if (filesize == 0) + fileview = NULL; + else + fileview = f.get_view(0, 0, filesize, false, false); unsigned int align; if (size == 32) @@ -223,10 +227,13 @@ Binary_to_elf::sized_convert(const Task* task) shstrtab.get_strtab_size(), 0, 0, 1, 0, &pout); - memcpy(pout, fileview, filesize); - pout += filesize; - memset(pout, 0, aligned_filesize - filesize); - pout += aligned_filesize - filesize; + if (filesize > 0) + { + memcpy(pout, fileview, filesize); + pout += filesize; + memset(pout, 0, aligned_filesize - filesize); + pout += aligned_filesize - filesize; + } this->write_symbol<size, big_endian>("", &strtab, 0, 0, &pout); this->write_symbol<size, big_endian>(start_symbol_name, &strtab, 0, 1, |