diff options
| author | Alan Modra <amodra@gmail.com> | 2017-08-31 12:48:37 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2017-08-31 13:18:16 +0930 |
| commit | af471f828cc74d65b50a7531ba2c69522266cfe9 (patch) | |
| tree | f9a11fc0d22c56b73b084b2e111efa198667d55c /bfd/elflink.c | |
| parent | 3321e42bf2b5819b76ca36e8964fe7cf9a8ae9a2 (diff) | |
| download | gdb-af471f828cc74d65b50a7531ba2c69522266cfe9.zip gdb-af471f828cc74d65b50a7531ba2c69522266cfe9.tar.gz gdb-af471f828cc74d65b50a7531ba2c69522266cfe9.tar.bz2 | |
PR22048, Incorrect .eh_frame section in libc.so
PR 21441
PR 22048
* elflink.c (bfd_elf_discard_info): Don't pad embedded zero
terminators.
Diffstat (limited to 'bfd/elflink.c')
| -rw-r--r-- | bfd/elflink.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/bfd/elflink.c b/bfd/elflink.c index ceacb37..f6f57fa 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -13878,17 +13878,22 @@ bfd_elf_discard_info (bfd *output_bfd, struct bfd_link_info *info) /* Any prior sections must pad the last FDE out to the output section alignment. Otherwise we might have zero padding between sections, which would be seen as a - terminator. */ + terminator. If there is a terminator in the middle of + FDEs, don't increase its size as that will write bogus + data of whatever was after the terminator in the input + file, to the output file. */ for (; i != NULL; i = i->map_tail.s) - { - bfd_size_type size = (i->size + eh_alignment - 1) & -eh_alignment; - if (i->size != size) - { - i->size = size; - changed = 1; - eh_changed = 1; - } - } + if (i->size != 4) + { + bfd_size_type size + = (i->size + eh_alignment - 1) & -eh_alignment; + if (i->size != size) + { + i->size = size; + changed = 1; + eh_changed = 1; + } + } } if (eh_changed) elf_link_hash_traverse (elf_hash_table (info), |