This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] fix assertion when returning from initial frame
- From: Nathan Froyd <froydnj at codesourcery dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 21 Feb 2007 08:24:35 -0800
- Subject: [PATCH] fix assertion when returning from initial frame
The following patch fixes an assertion when a user attempts to return
from the initial frame (or a frame for which GDB cannot find the
previous frame due to limited debugging information). frame_pop always
assumed that a previous frame could be found; it now checks that it
actually finds a previous frame before proceeding.
OK? (I do not have gdb commit privileges.)
-Nathan
2007-02-21 Nathan Froyd <froydnj@codesourcery.com>
* frame.c (frame_pop): Check to see whether there's a frame to
which we can pop first.
--- frame.c (revision 163834)
+++ frame.c (local)
@@ -524,13 +524,22 @@ frame_save_as_regcache (struct frame_inf
void
frame_pop (struct frame_info *this_frame)
{
+ struct frame_info *prev_frame;
+ struct regcache *scratch;
+ struct cleanup *cleanups;
+
+ /* Ensure that we have a frame to pop to. */
+ prev_frame = get_prev_frame_1 (this_frame);
+
+ if (!prev_frame)
+ error (_("Cannot pop the initial frame."));
+
/* Make a copy of all the register values unwound from this frame.
Save them in a scratch buffer so that there isn't a race between
trying to extract the old values from the current_regcache while
at the same time writing new values into that same cache. */
- struct regcache *scratch
- = frame_save_as_regcache (get_prev_frame_1 (this_frame));
- struct cleanup *cleanups = make_cleanup_regcache_xfree (scratch);
+ scratch = frame_save_as_regcache (prev_frame);
+ cleanups = make_cleanup_regcache_xfree (scratch);
/* FIXME: cagney/2003-03-16: It should be possible to tell the
target's register cache that it is about to be hit with a burst