diff options
Diffstat (limited to 'gdb/dwarf2loc.c')
| -rw-r--r-- | gdb/dwarf2loc.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index b163231..071b5ac 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -70,22 +70,28 @@ find_location_expression (struct dwarf2_loclist_baton *baton, while (1) { - low = dwarf2_read_address (gdbarch, loc_ptr, buf_end, addr_size); - loc_ptr += addr_size; - high = dwarf2_read_address (gdbarch, loc_ptr, buf_end, addr_size); - loc_ptr += addr_size; + if (buf_end - loc_ptr < 2 * addr_size) + error (_("find_location_expression: Corrupted DWARF expression.")); - /* An end-of-list entry. */ - if (low == 0 && high == 0) - return NULL; + low = extract_unsigned_integer (loc_ptr, addr_size, byte_order); + loc_ptr += addr_size; /* A base-address-selection entry. */ - if ((low & base_mask) == base_mask) + if (low == base_mask) { - base_address = high; + base_address = dwarf2_read_address (gdbarch, + loc_ptr, buf_end, addr_size); + loc_ptr += addr_size; continue; } + high = extract_unsigned_integer (loc_ptr, addr_size, byte_order); + loc_ptr += addr_size; + + /* An end-of-list entry. */ + if (low == 0 && high == 0) + return NULL; + /* Otherwise, a location expression entry. */ low += base_address; high += base_address; |