From d1b3de2e43380a0c51772a40315cd2268573d985 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 6 Nov 2016 21:10:18 -0700 Subject: [PATCH] Use gdbpy_ref in gdbpy_string_to_argv This chanes gdbpy_string_to_argv to use gdbpy_ref. 2017-01-10 Tom Tromey * python/py-cmd.c (gdbpy_string_to_argv): Use gdbpy_ref. --- gdb/ChangeLog | 4 ++++ gdb/python/py-cmd.c | 13 +++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1fa7915b5c2..1e8ce9954be 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-01-10 Tom Tromey + + * python/py-cmd.c (gdbpy_string_to_argv): Use gdbpy_ref. + 2017-01-10 Tom Tromey * python/py-type.c (convert_field, make_fielditem, typy_fields) diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c index 130466d9470..e2879b7cb3f 100644 --- a/gdb/python/py-cmd.c +++ b/gdb/python/py-cmd.c @@ -27,6 +27,7 @@ #include "cli/cli-decode.h" #include "completer.h" #include "language.h" +#include "py-ref.h" /* Struct representing built-in completion types. */ struct cmdpy_completer @@ -784,13 +785,12 @@ PyTypeObject cmdpy_object_type = PyObject * gdbpy_string_to_argv (PyObject *self, PyObject *args) { - PyObject *py_argv; const char *input; if (!PyArg_ParseTuple (args, "s", &input)) return NULL; - py_argv = PyList_New (0); + gdbpy_ref py_argv (PyList_New (0)); if (py_argv == NULL) return NULL; @@ -805,21 +805,18 @@ gdbpy_string_to_argv (PyObject *self, PyObject *args) for (i = 0; c_argv[i] != NULL; ++i) { - PyObject *argp = PyString_FromString (c_argv[i]); + gdbpy_ref argp (PyString_FromString (c_argv[i])); if (argp == NULL - || PyList_Append (py_argv, argp) < 0) + || PyList_Append (py_argv.get (), argp.get ()) < 0) { - Py_XDECREF (argp); - Py_DECREF (py_argv); freeargv (c_argv); return NULL; } - Py_DECREF (argp); } freeargv (c_argv); } - return py_argv; + return py_argv.release (); } -- 2.30.2