d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elfdump: use designated array initialization for note types

Browse Source 
This ensures the note type name is in the correct slot.

PR:		228290
Submitted by:	kib
MFC with:	343610
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
emaste 2019-01-31 16:49:06 +00:00
parent bea2e66e81
commit c731d25683
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/elfdump/elfdump.c
View File

@ -317,9 +317,13 @@ static const char *p_flags[] = {
"PF_X|PF_W|PF_R"
};
#define NT_ELEM(x) [x] = #x,
static const char *nt_types[] = {
"", "NT_FREEBSD_ABI_TAG", "NT_FREEBSD_NOINIT_TAG",
"NT_FREEBSD_ARCH_TAG", "NT_FREEBSD_FEATURE_CTL"
"",
NT_ELEM(NT_FREEBSD_ABI_TAG)
NT_ELEM(NT_FREEBSD_NOINIT_TAG)
NT_ELEM(NT_FREEBSD_ARCH_TAG)
NT_ELEM(NT_FREEBSD_FEATURE_CTL)
};
/* http://www.sco.com/developers/gabi/latest/ch4.sheader.html#sh_type */
@ -1079,7 +1083,7 @@ elf_print_note(Elf32_Ehdr *e, void *sh)
namesz = elf_get_word(e, n, N_NAMESZ);
descsz = elf_get_word(e, n, N_DESCSZ);
type = elf_get_word(e, n, N_TYPE);
if (type < nitems(nt_types))
if (type < nitems(nt_types) && nt_types[type] != NULL)
nt_type = nt_types[type];
else
nt_type = "Unknown type";