aboutsummaryrefslogtreecommitdiff
path: root/gdb/python/lib
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2014-01-22 08:52:15 -0700
committerTom Tromey <tromey@redhat.com>2014-01-23 08:03:52 -0700
commit83b645b833a4c137441b2ba1c03206371b28c9db (patch)
tree7f973cdbe3487cbfed37f55d40d432136ce9d19c /gdb/python/lib
parent0740f8d82dd18e48d1531c8d86b531341fc9e099 (diff)
downloadgdb-83b645b833a4c137441b2ba1c03206371b28c9db.zip
gdb-83b645b833a4c137441b2ba1c03206371b28c9db.tar.gz
gdb-83b645b833a4c137441b2ba1c03206371b28c9db.tar.bz2
avoid python exception in FrameDecorator.py
This fixes a bug in FrameDecorator.py. FrameVars seems to assume that Frame.block can return None if there is no block. However, it actually throws an exception. I saw this bug while developing a frame filter, but unfortunately I don't know how to reproduce it. It seems to me that the SAL tests in _is_limited_frame should exclude the bad cases; and in my attempts to write a test they do. Nevertheless I think the fix is reasonably obvious and ought to go in. 2014-01-23 Tom Tromey <tromey@redhat.com> PR python/16485: * python/lib/gdb/FrameDecorator.py: (FrameVars.fetch_frame_args): Handle exception from frame.block. (FrameVars.fetch_frame_locals): Likewise.
Diffstat (limited to 'gdb/python/lib')
-rw-r--r--gdb/python/lib/gdb/FrameDecorator.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/gdb/python/lib/gdb/FrameDecorator.py b/gdb/python/lib/gdb/FrameDecorator.py
index 1b8b4ed..1bbc5ab 100644
--- a/gdb/python/lib/gdb/FrameDecorator.py
+++ b/gdb/python/lib/gdb/FrameDecorator.py
@@ -258,7 +258,10 @@ class FrameVars(object):
are no frame local variables, return an empty list."""
lvars = []
- block = self.frame.block()
+ try:
+ block = self.frame.block()
+ except RuntimeError:
+ block = None
while block != None:
if block.is_global or block.is_static:
@@ -279,7 +282,12 @@ class FrameVars(object):
there are no frame argument variables, return an empty list."""
args = []
- block = self.frame.block()
+
+ try:
+ block = self.frame.block()
+ except RuntimeError:
+ block = None
+
while block != None:
if block.function != None:
break