* dwarf2-frame.c (execute_cfa_program): Complain if we encounter a

DW_CFA_restore state without a matching DW_CFA_remember_state
instead of aborting.  Fixes PR backtrace/1589.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3adcd0d07a4feaace45195a722c7523401eb55cb..937b6f3f0ffe7465acbd925762bee83e7d43abe3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-01  Mark Kettenis  <kettenis@gnu.org>
+
+       * dwarf2-frame.c (execute_cfa_program): Complain if we encounter a
+       DW_CFA_restore state without a matching DW_CFA_remember_state
+       instead of aborting.  Fixes PR backtrace/1589.
+
 2004-04-30  Joel Brobecker  <brobecker@gnat.com>
 
        * MAINTAINERS: Add self as AIX maintainer.

diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 13c836e7dc405b8e8674b8c4a6f9275962a41f47..fafc8fc6574914109b80e98d5faed65c52aa6edb 100644 (file)
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -372,11 +372,17 @@ execute_cfa_program (unsigned char *insn_ptr, unsigned char *insn_end,
              {
                struct dwarf2_frame_state_reg_info *old_rs = fs->regs.prev;
 
-               gdb_assert (old_rs);
-
-               xfree (fs->regs.reg);
-               fs->regs = *old_rs;
-               xfree (old_rs);
+               if (old_rs == NULL)
+                 {
+                   complaint (&symfile_complaints, "\
+bad CFI data; mismatched DW_CFA_restore_state at 0x%s", paddr (fs->pc));
+                 }
+               else
+                 {
+                   xfree (fs->regs.reg);
+                   fs->regs = *old_rs;
+                   xfree (old_rs);
+                 }
              }
              break;