diff options
| author | Tom Tromey <tromey@redhat.com> | 2014-01-22 08:44:41 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-01-23 08:03:51 -0700 |
| commit | 0740f8d82dd18e48d1531c8d86b531341fc9e099 (patch) | |
| tree | 6440d7d659446284e1d3a8a2a0586154704d0cba /gdb/testsuite | |
| parent | 21909fa1c6d934bfa0c7ad3ef95909db48f6f756 (diff) | |
| download | gdb-0740f8d82dd18e48d1531c8d86b531341fc9e099.zip gdb-0740f8d82dd18e48d1531c8d86b531341fc9e099.tar.gz gdb-0740f8d82dd18e48d1531c8d86b531341fc9e099.tar.bz2 | |
fix erroneous error-handling in frame filter code
This fixes PR python/16487.
The bug here is that the function-name-handling code in py_print_frame
had a small logic error (really a misplaced closing brace). This
error could lead to a Py_DECREF(NULL), which crashes.
This patch fixes the bug in the obvious way.
Built and regtested on x86-64 Fedora 18. New test case included.
2014-01-23 Tom Tromey <tromey@redhat.com>
PR python/16487:
* python/py-framefilter.c (py_print_frame): Don't call Py_DECREF
on a NULL pointer. Move "goto error" to correct place.
2014-01-23 Tom Tromey <tromey@redhat.com>
PR python/16487:
* gdb.python/py-framefilter.exp: Add test using "Error" filter.
* gdb.python/py-framefilter.py (ErrorInName, ErrorFilter): New
classes.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-framefilter.exp | 11 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-framefilter.py | 20 |
3 files changed, 38 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4e11cd1..b41a167 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2014-01-23 Tom Tromey <tromey@redhat.com> + PR python/16487: + * gdb.python/py-framefilter.exp: Add test using "Error" filter. + * gdb.python/py-framefilter.py (ErrorInName, ErrorFilter): New + classes. + +2014-01-23 Tom Tromey <tromey@redhat.com> + PR python/16491: * gdb.python/py-framefilter.py (Reverse_Function.function): Read a string from an inferior frame. diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp index 106240b..905ad8c 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.exp +++ b/gdb/testsuite/gdb.python/py-framefilter.exp @@ -177,6 +177,17 @@ gdb_test "bt 1" \ "#0 end_func \\(foo=21, bar=\"Param\", fb=, bf=\{nothing = \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \ "bt 1 no addresss" +gdb_test_no_output "set python print-stack message" \ + "Set python print-stack to message for Error filter" +gdb_test_no_output "enable frame-filter global Error" \ + "enable frame-filter global Error" +set test "bt 1 with Error filter" +gdb_test_multiple "bt 1" $test { + -re "Python Exception .*whoops:.*$gdb_prompt $" { + pass $test + } +} + remote_file host delete ${remote_python_file} # Test with no debuginfo diff --git a/gdb/testsuite/gdb.python/py-framefilter.py b/gdb/testsuite/gdb.python/py-framefilter.py index 25b3368..a085688 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.py +++ b/gdb/testsuite/gdb.python/py-framefilter.py @@ -128,5 +128,25 @@ class FrameElider (): def filter (self, frame_iter): return ElidingIterator (frame_iter) +# A simple decorator that gives an error when computing the function. +class ErrorInName(FrameDecorator): + def __init__(self, frame): + FrameDecorator.__init__(self, frame) + + def function(self): + raise RuntimeError('whoops') + +# A filter that supplies buggy frames. Disabled by default. +class ErrorFilter(): + def __init__ (self): + self.name = "Error" + self.priority = 1 + self.enabled = False + gdb.frame_filters [self.name] = self + + def filter(self, frame_iter): + return itertools.imap(ErrorInName, frame_iter) + FrameFilter() FrameElider() +ErrorFilter() |