2013-10-02 Phil Muldoon <pmuldoon@redhat.com>

	* python/py-frame.c (frame_info_to_frame_object): Use
	gdbpy_convert_exception. Clean up Python object on failure.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 22a227136049e30d6f11cc1628ecc360d0414308..7f86c8993e7f71036e64866aaef7703ef9111684 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-02  Phil Muldoon  <pmuldoon@redhat.com>
+
+       * python/py-frame.c (frame_info_to_frame_object): Use
+       gdbpy_convert_exception. Clean up Python object on failure.
+
 2013-10-02  Phil Muldoon  <pmuldoon@redhat.com>
 
        * python/lib/gdb/command/frame_filters.py

diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index f960b08bffa55f2abaefd67c822b706790438733..58cb8a0c5c30f999ef17d8025d349a894bc54f58 100644 (file)
--- a/gdb/python/py-frame.c
+++ b/gdb/python/py-frame.c
@@ -333,8 +333,12 @@ frame_info_to_frame_object (struct frame_info *frame)
        }
       frame_obj->gdbarch = get_frame_arch (frame);
     }
-  GDB_PY_HANDLE_EXCEPTION (except);
-
+  if (except.reason < 0)
+    {
+      Py_DECREF (frame_obj);
+      gdbpy_convert_exception (except);
+      return NULL;
+    }
   return (PyObject *) frame_obj;
 }