diff options
author | Markus Metzger <markus.t.metzger@intel.com> | 2016-01-26 14:58:44 +0100 |
---|---|---|
committer | Markus Metzger <markus.t.metzger@intel.com> | 2016-02-12 09:49:48 +0100 |
commit | 33b4777ca1b7b456af8201b98eda27d1b272cbab (patch) | |
tree | ed42f9fc456aba8951c1abcb4ecf050b434caaab /gdb/frame.h | |
parent | a038fa3e14a477d4d72a26c2e139fa47d2774be2 (diff) | |
download | gdb-33b4777ca1b7b456af8201b98eda27d1b272cbab.zip gdb-33b4777ca1b7b456af8201b98eda27d1b272cbab.tar.gz gdb-33b4777ca1b7b456af8201b98eda27d1b272cbab.tar.bz2 |
btrace, frame: fix crash in get_frame_type
In skip_artificial_frames we repeatedly call get_prev_frame_always until we get
a non-inline and non-tailcall frame assuming that there must be such a frame
eventually.
For record targets, however, we may have a frame chain that consists only of
artificial frames. This leads to a crash in get_frame_type when dereferencing a
NULL frame pointer.
Change skip_artificial_frames and skip_tailcall_frames to return NULL in such a
case and modify each caller to cope with a NULL return.
In frame_unwind_caller_pc and frame_unwind_caller_arch, we simply assert that
the returned value is not NULL. Their caller was supposed to check
frame_unwind_caller_id before calling those functions.
In other cases, we thrown an error.
In infcmd further move the skip_tailcall_frames call to the forward-stepping
case since we don't need a frame for reverse execution and we don't want to fail
because of that. Reverse-finish does make sense for a tailcall frame.
gdb/
* frame.h (skip_tailcall_frames): Update comment.
* frame.c (skip_artificial_frames, skip_tailcall_frames): Return NULL
if only artificial frames are found. Update comment.
(frame_unwind_caller_id): Handle NULL return.
(frame_unwind_caller_pc, frame_unwind_caller_arch): Assert that
skip_artificial_frames does not return NULL.
(frame_pop): Add an error if only tailcall frames are found.
* infcmd.c (finish_command): Move skip_tailcall_frames call into forward-
execution case. Add an error if only tailcall frames are found.
testsuite/
* gdb.btrace/tailcall-only.exp: New.
* gdb.btrace/tailcall-only.c: New.
* gdb.btrace/x86_64-tailcall-only.S: New.
* gdb.btrace/i686-tailcall-only.S: New.
Diffstat (limited to 'gdb/frame.h')
-rw-r--r-- | gdb/frame.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/frame.h b/gdb/frame.h index 7e8b01e..8ee64f1 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -821,7 +821,8 @@ extern int frame_unwinder_is (struct frame_info *fi, extern enum language get_frame_language (struct frame_info *frame); /* Return the first non-tailcall frame above FRAME or FRAME if it is not a - tailcall frame. */ + tailcall frame. Return NULL if FRAME is the start of a tailcall-only + chain. */ extern struct frame_info *skip_tailcall_frames (struct frame_info *frame); |