(CVS is doing wierd things)

Re-checkin fixes to code verifying dwarf debug info CU headers before
using it.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 614ba9234a5fee66392dcb33c3edb9f4dbd44bd1..feded4e9eef08761d6ead038ac1af36b1be61bc1 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -934,13 +934,17 @@ dwarf2_build_psymtabs_hard (objfile, section_offsets, mainline)
        }
       if (cu_header.abbrev_offset >= dwarf_abbrev_size)
        {
-         error ("Dwarf Error: bad offset in compilation unit header.");
+         error ("Dwarf Error: bad offset (0x%lx) in compilation unit header (at 0x%lx + 6).",
+                (long) cu_header.abbrev_offset,
+                (long) (beg_of_comp_unit - dwarf_info_buffer));
          return;
        }
       if (beg_of_comp_unit + cu_header.length + 4
-         >= dwarf_info_buffer + dwarf_info_size)
+         > dwarf_info_buffer + dwarf_info_size)
        {
-         error ("Dwarf Error: bad length in compilation unit header.");
+         error ("Dwarf Error: bad length (0x%lx) in compilation unit header (0x%lx + 0).",
+                (long) cu_header.length,
+                (long) (beg_of_comp_unit - dwarf_info_buffer));
          return;
        }