FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix py-frame.c

Browse source 
A couple return paths in frapy_read_var were missing do_cleanups calls.

	* python/py-frame.c (frapy_read_var): Call do_cleanups along
	all return paths.
This commit is contained in:
Tom Tromey 2013-05-30 17:16:05 +00:00
parent b862ce75d2
commit af1c697129
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2013-05-30 Tom Tromey <tromey@redhat.com>
* python/py-frame.c (frapy_read_var): Call do_cleanups along
all return paths.
2013-05-30 Tom Tromey <tromey@redhat.com> 2013-05-30 Tom Tromey <tromey@redhat.com>
* python/py-breakpoint.c (bppy_get_commands): Call do_cleanups * python/py-breakpoint.c (bppy_get_commands): Call do_cleanups

7
gdb/python/py-frame.c
View file

@ -461,6 +461,7 @@ frapy_read_var (PyObject *self, PyObject *args)
{ {
PyErr_SetString (PyExc_RuntimeError, PyErr_SetString (PyExc_RuntimeError,
_("Second argument must be block.")); _("Second argument must be block."));
do_cleanups (cleanup);
return NULL; return NULL;
} }
} }
@ -473,7 +474,11 @@ frapy_read_var (PyObject *self, PyObject *args)
block = get_frame_block (frame, NULL); block = get_frame_block (frame, NULL);
var = lookup_symbol (var_name, block, VAR_DOMAIN, NULL); var = lookup_symbol (var_name, block, VAR_DOMAIN, NULL);
} }
GDB_PY_HANDLE_EXCEPTION (except); if (except.reason < 0)
{
do_cleanups (cleanup);
GDB_PY_HANDLE_EXCEPTION (except);
}
if (!var) if (!var)
{ {