diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-05-30 17:14:35 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-05-30 17:14:35 +0000 |
| commit | b862ce75d2a1ac6b86812c7e512152e154e83ea6 (patch) | |
| tree | 232886951166426a8651c398a494bd5156b3fd36 /gdb | |
| parent | e12fefc804bcbe2d53554390b76f07005632a526 (diff) | |
| download | gdb-b862ce75d2a1ac6b86812c7e512152e154e83ea6.zip gdb-b862ce75d2a1ac6b86812c7e512152e154e83ea6.tar.gz gdb-b862ce75d2a1ac6b86812c7e512152e154e83ea6.tar.bz2 | |
fix py-breakpoint.c
One return path in bppy_get_commands was missing a do_cleanups call.
* python/py-breakpoint.c (bppy_get_commands): Call do_cleanups
along all return paths.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/python/py-breakpoint.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5b9e8dd..2588d05 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2013-05-30 Tom Tromey <tromey@redhat.com> + * python/py-breakpoint.c (bppy_get_commands): Call do_cleanups + along all return paths. + +2013-05-30 Tom Tromey <tromey@redhat.com> + * cli/cli-logging.c (set_logging_redirect): Unconditionally call do_cleanups. diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index d958f30..eaa1bc5 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -489,7 +489,11 @@ bppy_get_commands (PyObject *self, void *closure) print_command_lines (current_uiout, breakpoint_commands (bp), 0); } ui_out_redirect (current_uiout, NULL); - GDB_PY_HANDLE_EXCEPTION (except); + if (except.reason < 0) + { + do_cleanups (chain); + GDB_PY_HANDLE_EXCEPTION (except); + } cmdstr = ui_file_xstrdup (string_file, &length); make_cleanup (xfree, cmdstr); |