diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index eb4892531a1..0e2f5ff132b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2007-07-17 Daniel Jacobowitz <dan@codesourcery.com> + + * dwarf2read.c (dwarf_decode_lines): Detect address size mismatches. + 2007-07-16 H.J. Lu <hongjiu.lu@intel.com> * i386-linux-nat.c (fetch_regs): Work around gcc 3.4 alias diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 32d6f159f77..c12e3da6279 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -6668,9 +6668,9 @@ static void dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd, struct dwarf2_cu *cu, struct partial_symtab *pst) { - gdb_byte *line_ptr; + gdb_byte *line_ptr, *extended_end; gdb_byte *line_end; - unsigned int bytes_read; + unsigned int bytes_read, extended_len; unsigned char op_code, extended_op, adj_opcode; CORE_ADDR baseaddr; struct objfile *objfile = cu->objfile; @@ -6745,8 +6745,9 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd, else switch (op_code) { case DW_LNS_extended_op: - read_unsigned_leb128 (abfd, line_ptr, &bytes_read); + extended_len = read_unsigned_leb128 (abfd, line_ptr, &bytes_read); line_ptr += bytes_read; + extended_end = line_ptr + extended_len; extended_op = read_1_byte (abfd, line_ptr); line_ptr += 1; switch (extended_op) @@ -6792,6 +6793,15 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd, _("mangled .debug_line section")); return; } + /* Make sure that we parsed the extended op correctly. If e.g. + we expected a different address size than the producer used, + we may have read the wrong number of bytes. */ + if (line_ptr != extended_end) + { + complaint (&symfile_complaints, + _("mangled .debug_line section")); + return; + } break; case DW_LNS_copy: if (lh->num_file_names < file) |