Date: Mon, 27 Jul 2020 14:08:29 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r363600 - stable/12/contrib/elftoolchain/libdwarf Message-ID: <202007271408.06RE8TH3063097@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Mon Jul 27 14:08:29 2020 New Revision: 363600 URL: https://svnweb.freebsd.org/changeset/base/363600 Log: MFC r363375: libdwarf: Hide SHT_NOBITS sections. PR: 239516 Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c ============================================================================== --- stable/12/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Mon Jul 27 11:42:22 2020 (r363599) +++ stable/12/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Mon Jul 27 14:08:29 2020 (r363600) @@ -260,6 +260,9 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *elf, Dwarf_Error goto fail_cleanup; } + if (sh.sh_type == SHT_NOBITS) + continue; + if ((name = elf_strptr(elf, e->eo_strndx, sh.sh_name)) == NULL) { DWARF_SET_ELF_ERROR(dbg, error); @@ -312,6 +315,9 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *elf, Dwarf_Error ret = DW_DLE_ELF; goto fail_cleanup; } + + if (sh.sh_type == SHT_NOBITS) + continue; memcpy(&e->eo_shdr[j], &sh, sizeof(sh));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007271408.06RE8TH3063097>