Patchwork [gdb/python] Fix cpychecker error in recpy_bt_goto

login
register
mail settings
Submitter Tom de Vries
Date Oct. 4, 2018, 6:08 p.m.
Message ID <20181004180759.GA23984@delia>
Download mbox | patch
Permalink /patch/29650/
State New
Headers show

Comments

Tom de Vries - Oct. 4, 2018, 6:08 p.m.
Hi,

When using cpychecker, we run into this error:
...
gdb/python/py-record-btrace.c: \
  In function ‘PyObject* recpy_bt_goto(PyObject*, PyObject*)’:
gdb/python/py-record-btrace.c:783:25: error: Mismatching type in call to \
  PyArg_ParseTuple with format code "O" [-Werror]
   if (!PyArg_ParseTuple (args, "O", &obj))
  argument 3 ("&obj") had type
    "const struct recpy_element_object * *"
  but was expecting
    "struct PyObject * *"
  for format code "O"
...

Fix this by using a new variable of the expected type instead.

Build and reg-tested on x86_64-linux.

OK for trunk?

Thanks,
- Tom

[gdb/python] Fix cpychecker error in recpy_bt_goto

2018-10-04  Tom de Vries  <tdevries@suse.de>

	* python/py-record-btrace.c (recpy_bt_goto): Fix type mismatch in
	PyArg_ParseTuple call.

---
 gdb/python/py-record-btrace.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Tom Tromey - Oct. 4, 2018, 10:11 p.m.
>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:

Tom> When using cpychecker, we run into this error:

Thanks for trying this out!

Tom> 2018-10-04  Tom de Vries  <tdevries@suse.de>

Tom> 	* python/py-record-btrace.c (recpy_bt_goto): Fix type mismatch in
Tom> 	PyArg_ParseTuple call.

Tom> +  obj = (const recpy_element_object *)parse_obj;
 
There should be a space after the close paren.
Ok with that change.

Tom

Patch

diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c
index 057475e112..006b56c9ab 100644
--- a/gdb/python/py-record-btrace.c
+++ b/gdb/python/py-record-btrace.c
@@ -776,15 +776,17 @@  recpy_bt_goto (PyObject *self, PyObject *args)
   const recpy_record_object * const record = (recpy_record_object *) self;
   thread_info *const tinfo = record->thread;
   const recpy_element_object *obj;
+  PyObject *parse_obj;
 
   if (tinfo == NULL || btrace_is_empty (tinfo))
 	return PyErr_Format (gdbpy_gdb_error, _("Empty branch trace."));
 
-  if (!PyArg_ParseTuple (args, "O", &obj))
+  if (!PyArg_ParseTuple (args, "O", &parse_obj))
     return NULL;
 
-  if (Py_TYPE (obj) != &recpy_insn_type)
+  if (Py_TYPE (parse_obj) != &recpy_insn_type)
     return PyErr_Format (PyExc_TypeError, _("Argument must be instruction."));
+  obj = (const recpy_element_object *)parse_obj;
 
   TRY
     {