From 92ad9f6b57d841acf26aea784ad7f73feb2bfb99 Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Fri, 25 Nov 2005 06:42:07 +0000 Subject: [PATCH] * dwarf2-frame.c: (execute_cfa_program): Don't access past the allocated dwarf2_frame_state.initial.regs. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2-frame.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dd8067f083..de1c5c3854 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2005-11-25 Frederic Riss + + * dwarf2-frame.c: (execute_cfa_program): Don't access past the + allocated dwarf2_frame_state.initial.regs. + 2005-11-25 Frederic Riss * MAINTAINERS (Write After Approval): Add myself to the list. diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index ef0d6266fd..c65967fcff 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -294,7 +294,17 @@ execute_cfa_program (gdb_byte *insn_ptr, gdb_byte *insn_end, gdb_assert (fs->initial.reg); reg = insn & 0x3f; dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); - fs->regs.reg[reg] = fs->initial.reg[reg]; + if (reg < fs->initial.num_regs) + fs->regs.reg[reg] = fs->initial.reg[reg]; + else + fs->regs.reg[reg].how = DWARF2_FRAME_REG_UNSPECIFIED; + + if (fs->regs.reg[reg].how == DWARF2_FRAME_REG_UNSPECIFIED) + complaint (&symfile_complaints, _("\ +incomplete CFI data; DW_CFA_restore unspecified\n\ +register %s (#%d) at 0x%s"), + REGISTER_NAME(DWARF2_REG_TO_REGNUM(reg)), + DWARF2_REG_TO_REGNUM(reg), paddr (fs->pc)); } else { -- 2.34.1