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

	entries.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e99003ca6543f99f2e02688f9f51ecb7ee7a3b9..bea378f0f11090553612c9f26c54b28aee21931d 100644 (file)
--- 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 9e19e78fda18e1df4c0837d9222d3ab699cc68a5..54a6dfbdb43fd922e34d3f64865d113536d86ccc 100644 (file)
--- 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,