diff options
| author | Pedro Alves <palves@redhat.com> | 2013-04-19 15:35:21 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2013-04-19 15:35:21 +0000 |
| commit | 507a579c9a5e778ae737c7066df4864c5f1d2ccc (patch) | |
| tree | 2c3ee6bfd33bc1d9328004e54a067424999cea16 | |
| parent | f9d83a0bd683b2298279bb93be8cf499fef90b6c (diff) | |
| download | binutils-gdb-507a579c9a5e778ae737c7066df4864c5f1d2ccc.tar.gz | |
-Wpointer-sign: dwarf2-frame.c: Pass unsigned variable to safe_read_uleb128.
The 'bytes_read' change should be obvious. As for the other hunk,
we're passing the address of the signed 'offset' to safe_read_uleb128,
which expects unsigned. Fix it by passing the address of the unsigned
'utmp' instead, like already done on other spots in the file.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* dwarf2-frame.c (execute_cfa_program): Make 'bytes_read' local
unsigned. Pass 'tmp' to safe_read_uleb128 instead of the signed
'offset', and adjust.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/dwarf2-frame.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0d2e7f39234..61fba01d70a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2013-04-19 Pedro Alves <palves@redhat.com> + * dwarf2-frame.c (execute_cfa_program): Make 'bytes_read' local + unsigned. Pass 'tmp' to safe_read_uleb128 instead of the signed + 'offset', and adjust. + +2013-04-19 Pedro Alves <palves@redhat.com> + * dwarf2read.c (dwarf2_get_dwz_file): Add cast to const char *. (read_index_from_section): Add cast to 'char *'. diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index dc9759045de..5c88b039ae0 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -410,7 +410,7 @@ execute_cfa_program (struct dwarf2_fde *fde, const gdb_byte *insn_ptr, CORE_ADDR pc, struct dwarf2_frame_state *fs) { int eh_frame_p = fde->eh_frame_p; - int bytes_read; + unsigned int bytes_read; enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); while (insn_ptr < insn_end && fs->pc <= pc) @@ -672,8 +672,8 @@ bad CFI data; mismatched DW_CFA_restore_state at %s"), case DW_CFA_GNU_negative_offset_extended: insn_ptr = safe_read_uleb128 (insn_ptr, insn_end, ®); reg = dwarf2_frame_adjust_regnum (gdbarch, reg, eh_frame_p); - insn_ptr = safe_read_uleb128 (insn_ptr, insn_end, &offset); - offset *= fs->data_align; + insn_ptr = safe_read_uleb128 (insn_ptr, insn_end, &utmp); + offset = utmp * fs->data_align; dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); fs->regs.reg[reg].how = DWARF2_FRAME_REG_SAVED_OFFSET; fs->regs.reg[reg].loc.offset = -offset; |