* python/python.c (gdbpy_decode_line): Move cleanup creation out

of TRY_CATCH.  Fix error handling.
	* python/py-value.c (convert_value_from_python): Move 'old'
	declaration to innermost scope.
This commit is contained in:
Tom Tromey 2012-03-30 20:05:55 +00:00
parent f87a302320
commit 9bc3523d11
3 changed files with 30 additions and 9 deletions

View file

@ -1250,7 +1250,6 @@ struct value *
convert_value_from_python (PyObject *obj)
{
struct value *value = NULL; /* -Wall */
struct cleanup *old;
volatile struct gdb_exception except;
int cmp;
@ -1319,6 +1318,8 @@ convert_value_from_python (PyObject *obj)
s = python_string_to_target_string (obj);
if (s != NULL)
{
struct cleanup *old;
old = make_cleanup (xfree, s);
value = value_cstring (s, strlen (s), builtin_type_pychar);
do_cleanups (old);