From 96b1ad866b1c861f772c5a11b556766c73c3d1ab Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 2 Oct 2018 21:47:37 +0200 Subject: [PATCH] [gdb/python] Fix cpychecker error in recpy_bt_goto MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. 2018-10-05 Tom de Vries * python/py-record-btrace.c (recpy_bt_goto): Fix type mismatch in PyArg_ParseTuple call. --- gdb/ChangeLog | 5 +++++ gdb/python/py-record-btrace.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d026da0..47f879f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-10-05 Tom de Vries + + * python/py-record-btrace.c (recpy_bt_goto): Fix type mismatch in + PyArg_ParseTuple call. + 2018-10-04 Joel Brobecker * psymtab.c (recursively_search_psymtabs): Reformat parameters diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c index 057475e..44cb441 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 { -- 2.7.4