* python/python.c (gdbpy_find_pc_line): Call find_pc_line

	inside TRY_CATCH.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b9c67570d3c0b043ab85855abba3d549e800525f..e785983766907ab792064385448d821bf439e143 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-28  Tom Tromey  <tromey@redhat.com>
+
+       * python/python.c (gdbpy_find_pc_line): Call find_pc_line
+       inside TRY_CATCH.
+
 2013-02-28  Tom Tromey  <tromey@redhat.com>
 
        * py-finishbreakpoint.c (bpfinishpy_init): Reorganize to call

diff --git a/gdb/python/python.c b/gdb/python/python.c
index 8dd65a102c20f18124fd8eca0c4fbeb7bf418252..e2c19b3d3a0565f339cd6983304e86123e8b7fad 100644 (file)
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -738,16 +738,25 @@ gdbpy_parse_and_eval (PyObject *self, PyObject *args)
 static PyObject *
 gdbpy_find_pc_line (PyObject *self, PyObject *args)
 {
-  struct symtab_and_line sal;
-  CORE_ADDR pc;
   gdb_py_ulongest pc_llu;
+  volatile struct gdb_exception except;
+  PyObject *result;
 
   if (!PyArg_ParseTuple (args, GDB_PY_LLU_ARG, &pc_llu))
     return NULL;
 
-  pc = (CORE_ADDR) pc_llu;
-  sal = find_pc_line (pc, 0);
-  return symtab_and_line_to_sal_object (sal);
+  TRY_CATCH (except, RETURN_MASK_ALL)
+    {
+      struct symtab_and_line sal;
+      CORE_ADDR pc;
+
+      pc = (CORE_ADDR) pc_llu;
+      sal = find_pc_line (pc, 0);
+      result = symtab_and_line_to_sal_object (sal);
+    }
+  GDB_PY_HANDLE_EXCEPTION (except);
+
+  return result;
 }
 
 /* Read a file as Python code.