* dwarf2read.c (dwarf_decode_lines): Detect address size mismatches.

This commit is contained in:
Daniel Jacobowitz 2007-07-17 12:46:35 +00:00
parent bd4dd364df
commit a8c50c1f55
2 changed files with 17 additions and 3 deletions

View File

@ -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

View File

@ -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)