This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[3/5] RFC: fix bug in gdbpy_find_pc_line
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Thu, 07 Feb 2013 14:01:46 -0700
- Subject: [3/5] RFC: fix bug in gdbpy_find_pc_line
The checker pointed out that gdbpy_find_pc_line calls some gdb functions
outside of TRY_CATCH. In particular I think at least find_pc_line can
throw.
Tom
* python/python.c (gdbpy_find_pc_line): Call find_pc_line
inside TRY_CATCH.
---
gdb/python/python.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 8dd65a1..e2c19b3 100644
--- 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.
--
1.7.7.6