Prevent a bigus warning from readelf about a gdb-index table being too big.

	PR binutils/21319
	* dwarf.c (display_gdb_index): Correct test for a corrupt address
	table size.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5323e6a94bc620991d182410eb4c9d2ca490c8e1..1c8d1aa02e537d9d0b9a3b75adf475d27f655ce7 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-10  John Delsignor  <john.delsignore@roguewave.com>
+
+       PR binutils/21319
+       * dwarf.c (display_gdb_index): Correct test for a corrupt address
+       table size.
+
 2017-04-05  Jiong Wang  <jiong.wang@arm.com>
 
        * objcopy.c (struct redefine_node): Delete the field "next".

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index fdfbc16e88723255a12ec20e2be60ce20ea6bb5f..559d6f8bb977b2fada04eb78515125b06ea7ac33 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -7670,7 +7670,7 @@ display_gdb_index (struct dwarf_section *section,
   symbol_table = start + symbol_table_offset;
   constant_pool = start + constant_pool_offset;
 
-  if (address_table + address_table_size * (2 + 8 + 4) > section->start + section->size)
+  if (address_table + address_table_size > section->start + section->size)
     {
       warn (_("Address table extends beyond end of section.\n"));
       return 0;