OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Nick Alcock 2019-07-13 19:47:11 +01:00
parent 2db912ba1a
commit 616febde0c
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binutils/ChangeLog
View File

@ -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.

3
binutils/doc/binutils.texi
View File

@ -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.

10
binutils/readelf.c
View File

@ -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)
{