espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 09:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in gdbpy_parse_register_id

Browse Source 
I noticed that gdbpy_parse_register_id would assert if passed a Python
object of a type it was not expecting.  The included test case shows
this crash.  This patch fixes the problem and also changes
gdbpy_parse_register_id to be more "Python-like" -- it always ensures
the Python error is set when it fails, and the callers now simply
propagate the existing exception.
This commit is contained in:
Tom Tromey
2022-04-27 15:22:56 -06:00
parent 12f26cb22e
commit bdc8cfc1e4
7 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gdb/python/py-registers.c
View File

@ -381,21 +381,27 @@ gdbpy_parse_register_id (struct gdbarch *gdbarch, PyObject *pyo_reg_id,
{
*reg_num = user_reg_map_name_to_regnum (gdbarch, reg_name.get (),
strlen (reg_name.get ()));
return *reg_num >= 0;
if (*reg_num >= 0)
return true;
PyErr_SetString (PyExc_ValueError, "Bad register");
}
}
/* The register could be its internal GDB register number. */
else if (PyLong_Check (pyo_reg_id))
{
long value;
if (gdb_py_int_as_long (pyo_reg_id, &value) && (int) value == value)
if (gdb_py_int_as_long (pyo_reg_id, &value) == 0)
{
if (user_reg_map_regnum_to_name (gdbarch, value) != NULL)
{
*reg_num = (int) value;
return true;
}
/* Nothing -- error. */
}
else if ((int) value == value
&& user_reg_map_regnum_to_name (gdbarch, value) != NULL)
{
*reg_num = (int) value;
return true;
}
else
PyErr_SetString (PyExc_ValueError, "Bad register");
}
/* The register could be a gdb.RegisterDescriptor object. */
else if (PyObject_IsInstance (pyo_reg_id,
@ -412,6 +418,8 @@ gdbpy_parse_register_id (struct gdbarch *gdbarch, PyObject *pyo_reg_id,
PyErr_SetString (PyExc_ValueError,
_("Invalid Architecture in RegisterDescriptor"));
}
else
PyErr_SetString (PyExc_TypeError, _("Invalid type for register"));
gdb_assert (PyErr_Occurred ());
return false;