Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils into robustify

diff --cc libelf/ChangeLog
Simple merge

diff --cc libelf/elf32_updatefile.c
Simple merge

diff --cc libelf/libelfP.h
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/elflint.c
Simple merge

diff --cc src/readelf.c
index 03eec292ae1a8ba0c99b15949404d64a925782aa,d5a3b8d4582c2a02e3ae6c8359be7d68d04a5d24..9e4270e248a3c55b308a658c60051b38c7613d2e
--- 1/src/readelf.c
--- 2/src/readelf.c
+++ b/src/readelf.c
@@@ -4074,22 -4058,12 +4088,22 @@@ print_debug_aranges_section (Dwfl_Modul
        return;
      }
  
 +  GElf_Shdr glink_mem;
 +  GElf_Shdr *glink;
 +  glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), &glink_mem);
 +  if (glink == NULL)
 +    {
 +      error (0, 0, gettext ("invalid sh_link value in section %Zu"),
 +           elf_ndxscn (scn));
 +      return;
 +    }
 +
    printf (ngettext ("\
- \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",
+ \nDWARF section [%2zu] '%s' at offset %#" PRIx64 " contains %zu entry:\n",
                    "\
- \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entries:\n",
+ \nDWARF section [%2zu] '%s' at offset %#" PRIx64 " contains %zu entries:\n",
                    cnt),
-         ".debug_aranges", (uint64_t) shdr->sh_offset, cnt);
+         elf_ndxscn (scn), ".debug_aranges", (uint64_t) shdr->sh_offset, cnt);
  
    /* Compute floor(log16(cnt)).  */
    size_t tmp = cnt;

diff --cc src/strip.c
Simple merge