diff options
| author | Nick Alcock <nick.alcock@oracle.com> | 2019-07-13 19:47:11 +0100 |
|---|---|---|
| committer | Nick Alcock <nick.alcock@oracle.com> | 2019-10-03 17:04:55 +0100 |
| commit | 616febde0c661843219b66e08e652e76ce856b8f (patch) | |
| tree | d682ec59d7393fa18c10248503bd7a65bafb69b5 /binutils/readelf.c | |
| parent | 2db912ba1a9e1c249cb4795f781fd4ea9fe9e7f2 (diff) | |
| download | binutils-616febde0c661843219b66e08e652e76ce856b8f.zip binutils-616febde0c661843219b66e08e652e76ce856b8f.tar.gz binutils-616febde0c661843219b66e08e652e76ce856b8f.tar.bz2 | |
binutils: readelf: when dumping CTF, load strtab and symtab automatically
We were only loading them when explicitly requested, which leads to
strings that point off into empty space (into the non-loaded "external"
ELF string table). Avoid this unfortunate consequence by loading the
strtab and symtab by default, unless a blank name is given.
binutils/
* readelf.c (dump_ctf_symtab_name): Give default value.
(dump_ctf_strtab_name): Likewise.
(dump_section_as_ctf): Allow for the null string.
Diffstat (limited to 'binutils/readelf.c')
| -rw-r--r-- | binutils/readelf.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/binutils/readelf.c b/binutils/readelf.c index 7e2b3ad..cecad76 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -13944,7 +13944,13 @@ dump_section_as_ctf (Elf_Internal_Shdr * section, Filedata * filedata) data = get_section_contents (section, filedata); ctfsect.cts_data = data; - if (dump_ctf_symtab_name) + if (!dump_ctf_symtab_name) + dump_ctf_symtab_name = strdup (".symtab"); + + if (!dump_ctf_strtab_name) + dump_ctf_strtab_name = strdup (".strtab"); + + if (dump_ctf_symtab_name && dump_ctf_symtab_name[0] != 0) { if ((symtab_sec = find_section (filedata, dump_ctf_symtab_name)) == NULL) { @@ -13959,7 +13965,7 @@ dump_section_as_ctf (Elf_Internal_Shdr * section, Filedata * filedata) symsectp = shdr_to_ctf_sect (&symsect, symtab_sec, filedata); symsect.cts_data = symdata; } - if (dump_ctf_strtab_name) + if (dump_ctf_strtab_name && dump_ctf_symtab_name[0] != 0) { if ((strtab_sec = find_section (filedata, dump_ctf_strtab_name)) == NULL) { |