fix py-frame.c

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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2588d05ec468022b4fbf45bbed6806a26eb311a0..d5a5452ce2ac10ccd821de588a845c815dbd1c35 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
 
        * python/py-breakpoint.c (bppy_get_commands): Call do_cleanups

diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index c29d626cbdf84fd73628110d94fa6065750c2594..2615ddf75fb14a8b7fe599b59f53ca14f9e6ff64 100644 (file)
--- a/gdb/python/py-frame.c
+++ b/gdb/python/py-frame.c
@@ -461,6 +461,7 @@ frapy_read_var (PyObject *self, PyObject *args)
            {
              PyErr_SetString (PyExc_RuntimeError,
                               _("Second argument must be block."));
+             do_cleanups (cleanup);
              return NULL;
            }
        }
@@ -473,7 +474,11 @@ frapy_read_var (PyObject *self, PyObject *args)
            block = get_frame_block (frame, 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)
        {