From: Doug Evans <dje@google.com>
Date: Fri, 9 Aug 2013 17:26:40 +0000 (+0000)
Subject: 	* dwarf2read.c (create_addrmap_from_index): Ignore bad address table
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24a550149d4e29a9285b420d27bc0b2b487b802a;p=binutils-gdb.git

	* dwarf2read.c (create_addrmap_from_index): Ignore bad address table
	entries.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e99003ca65..bea378f0f11 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-09  Doug Evans  <dje@google.com>
+
+	* dwarf2read.c (create_addrmap_from_index): Ignore bad address table
+	entries.
+
 2013-08-09  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* linux-tdep.c: Define enum with generic signal numbers.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 9e19e78fda1..54a6dfbdb43 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2570,17 +2570,24 @@ create_addrmap_from_index (struct objfile *objfile, struct mapped_index *index)
       cu_index = extract_unsigned_integer (iter, 4, BFD_ENDIAN_LITTLE);
       iter += 4;
 
-      if (cu_index < dwarf2_per_objfile->n_comp_units)
+      if (lo > hi)
 	{
-	  addrmap_set_empty (mutable_map, lo + baseaddr, hi + baseaddr - 1,
-			     dw2_get_cu (cu_index));
+	  complaint (&symfile_complaints,
+		     _(".gdb_index address table has invalid range (%s - %s)"),
+		     pulongest (lo), pulongest (hi));
+	  continue;
 	}
-      else
+
+      if (cu_index >= dwarf2_per_objfile->n_comp_units)
 	{
 	  complaint (&symfile_complaints,
 		     _(".gdb_index address table has invalid CU number %u"),
 		     (unsigned) cu_index);
+	  continue;
 	}
+
+      addrmap_set_empty (mutable_map, lo + baseaddr, hi + baseaddr - 1,
+			 dw2_get_cu (cu_index));
     }
 
   objfile->psymtabs_addrmap = addrmap_create_fixed (mutable_map,