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

Conflicts:
	libelf/elf32_getshdr.c

diff --cc libelf/ChangeLog
Simple merge

diff --cc libelf/elf32_getshdr.c
index 5b206de9eb228b7f3a20161470ead97edea761a4,8d650d9f29bd12b3ad75dc65b68d56aa68a87371..ac1458d518751e230cbae31cd5cd6b69e25a468a
--- 1/libelf/elf32_getshdr.c
--- 2/libelf/elf32_getshdr.c
+++ b/libelf/elf32_getshdr.c
@@@ -1,5 -1,5 +1,5 @@@
  /* Return section header.
-    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2008 Red Hat, Inc.
 -   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2009 Red Hat, Inc.
++   Copyright (C) 1998-2009 Red Hat, Inc.
     This file is part of Red Hat elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 1998.
  
@@@ -81,8 -81,7 +81,8 @@@ load_shdr_wrlock (Elf_Scn *scn
      goto out;
  
    size_t shnum;
-   if (__elf_getshnum_rdlock (elf, &shnum) != 0
 -  if (__elf_getshdrnum_rdlock (elf, &shnum) != 0)
++  if (__elf_getshdrnum_rdlock (elf, &shnum) != 0
 +      || shnum > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Shdr)))
      goto out;
    size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));
  

diff --cc libelf/elf32_updatefile.c
Simple merge

diff --cc libelf/elf_getshdrstrndx.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
Simple merge

diff --cc src/strip.c
Simple merge