Merge branch 'master' into robustify

diff --cc libdwfl/ChangeLog
Simple merge

diff --cc libelf/ChangeLog
Simple merge

diff --cc libelf/elf32_getshdr.c
Simple merge

diff --cc libelf/elf_begin.c
Simple merge

diff --cc libelf/elf_getarsym.c
index c3ed99bc5964a1639dd1611123fe2e59c0c1349a,9e0f4c2bbf54f677dfe34ffc00344a1eacf43529..3a578a7595c079014cd438949ef12d16e38d2578
--- 1/libelf/elf_getarsym.c
--- 2/libelf/elf_getarsym.c
+++ b/libelf/elf_getarsym.c
@@@ -158,10 -181,7 +181,10 @@@ elf_getarsym (elf, ptr
        size_t index_size = atol (tmpbuf);
  
        if (SARMAG + sizeof (struct ar_hdr) + index_size > elf->maximum_size
-         || n * sizeof (uint32_t) > index_size)
 +#if SIZE_MAX <= 4294967295U
 +        || n >= SIZE_MAX / sizeof (Elf_Arsym)
 +#endif
+         || n * w > index_size)
        {
          /* This index table cannot be right since it does not fit into
             the file.  */

diff --cc src/ChangeLog
Simple merge

diff --cc src/elflint.c
Simple merge

diff --cc src/readelf.c
Simple merge