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 | |
| parent | 2db912ba1a9e1c249cb4795f781fd4ea9fe9e7f2 (diff) | |
| download | gdb-616febde0c661843219b66e08e652e76ce856b8f.zip gdb-616febde0c661843219b66e08e652e76ce856b8f.tar.gz gdb-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')
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/doc/binutils.texi | 3 | ||||
| -rw-r--r-- | binutils/readelf.c | 10 |
3 files changed, 16 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 356eb05..629e156 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2019-07-13 Nick Alcock <nick.alcock@oracle.com> + + * readelf.c (dump_ctf_symtab_name): Give default value. + (dump_ctf_strtab_name): Likewise. + (dump_section_as_ctf): Allow for the null string. + 2019-07-08 Nick Alcock <nick.alcock@oracle.com> * objdump.c (dump_ctf_archive_member): Dump the CTF header. diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index b0de3d0..81d8bc1 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -4850,7 +4850,8 @@ command to @command{ar}, but without using the BFD library. @xref{ar}. @item --ctf-symbols=@var{section} @item --ctf-strings=@var{section} Specify the name of another section from which the CTF file can inherit -strings and symbols. +strings and symbols. By default, the @code{.symtab} and its linked +string table are used. If either of @option{--ctf-symbols} or @option{--ctf-strings} is specified, the other must be specified as well. 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) { |