diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/dwarf2.c | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 97c62c7..a7a7608 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2005-08-10 James E. Wilson <wilson@specifix.com> + + * dwarf2.c (scan_unit_for_symbols, case DT_AT_location): Verify that + DW_OP_addr is only opcode in location before using it. + 2005-08-09 H.J. Lu <hongjiu.lu@intel.com> * elfxx-ia64.c (elfNN_ia64_final_link): Reset gp. diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index 2635a57..1348137 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -1782,9 +1782,17 @@ scan_unit_for_symbols (struct comp_unit *unit) if (*attr.u.blk->data == DW_OP_addr) { var->stack = 0; - var->addr = bfd_get ((attr.u.blk->size - 1) * 8, - unit->abfd, - attr.u.blk->data + 1); + + /* Verify that DW_OP_addr is the only opcode in the + location, in which case the block size will be 1 + plus the address size. */ + /* ??? For TLS variables, gcc can emit + DW_OP_addr <addr> DW_OP_GNU_push_tls_address + which we don't handle here yet. */ + if (attr.u.blk->size == unit->addr_size + 1U) + var->addr = bfd_get (unit->addr_size * 8, + unit->abfd, + attr.u.blk->data + 1); } break; |