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

rtld dump_auxv: be pedantic and distiguish between auxv union members based on format

Browse Source 
(cherry picked from commit b61bce17f3)
This commit is contained in:
Konstantin Belousov 2021-11-13 21:04:51 +02:00
parent f363b08c6d
commit b26ac07d6c
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libexec/rtld-elf/rtld.c
View File

@ -6105,6 +6105,15 @@ static const struct auxfmt {
AUXFMT(AT_FXRNG, "%p"),
};
static bool
is_ptr_fmt(const char *fmt)
{
char last;
last = fmt[strlen(fmt) - 1];
return (last == 'p' || last == 's');
}
static void
dump_auxv(Elf_Auxinfo **aux_info)
{
@ -6120,7 +6129,13 @@ dump_auxv(Elf_Auxinfo **aux_info)
if (fmt->fmt == NULL)
continue;
rtld_fdprintf(STDOUT_FILENO, "%s:\t", fmt->name);
rtld_fdprintfx(STDOUT_FILENO, fmt->fmt, auxp->a_un.a_ptr);
if (is_ptr_fmt(fmt->fmt)) {
rtld_fdprintfx(STDOUT_FILENO, fmt->fmt,
auxp->a_un.a_ptr);
} else {
rtld_fdprintfx(STDOUT_FILENO, fmt->fmt,
auxp->a_un.a_val);
}
rtld_fdprintf(STDOUT_FILENO, "\n");
}
}