From: Mark Wielaard <mjw@redhat.com>
Date: Mon, 27 Aug 2012 13:33:41 +0000 (+0200)
Subject: Merge branch 'master' into robustify
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=683d6a2c6b9641cfaea3f17cf3a5b5e2df62cb10;p=thirdparty%2Felfutils.git

Merge branch 'master' into robustify
---

683d6a2c6b9641cfaea3f17cf3a5b5e2df62cb10
diff --cc libelf/elf_getarsym.c
index c3ed99bc5,9e0f4c2bb..3a578a759
--- a/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
 +#if SIZE_MAX <= 4294967295U
 +	  || n >= SIZE_MAX / sizeof (Elf_Arsym)
 +#endif
- 	  || n * sizeof (uint32_t) > index_size)
+ 	  || n * w > index_size)
  	{
  	  /* This index table cannot be right since it does not fit into
  	     the file.  */