From patchwork Mon Nov 7 05:47:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17248 Received: (qmail 78994 invoked by alias); 7 Nov 2016 05:48:30 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 76535 invoked by uid 89); 7 Nov 2016 05:48:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:4.86_1, H*Ad:U*tom X-HELO: gproxy5-pub.mail.unifiedlayer.com Received: from gproxy5-pub.mail.unifiedlayer.com (HELO gproxy5-pub.mail.unifiedlayer.com) (67.222.38.55) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Mon, 07 Nov 2016 05:47:47 +0000 Received: (qmail 22146 invoked by uid 0); 7 Nov 2016 05:47:45 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy5.mail.unifiedlayer.com with SMTP; 7 Nov 2016 05:47:45 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by CMOut01 with id 4tnh1u00C2f2jeq01tnkij; Sun, 06 Nov 2016 22:47:44 -0700 X-Authority-Analysis: v=2.1 cv=beT4Do/B c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=L24OOQBejmoA:10 a=zstS-IiYAAAA:8 a=h-1NnrTmwlc0CXVo6xUA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:47918 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c3cmU-0008A3-J1; Sun, 06 Nov 2016 22:47:42 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 10/14] Use gdbpy_reference in call_doc_function Date: Sun, 6 Nov 2016 22:47:32 -0700 Message-Id: <1478497656-11832-11-git-send-email-tom@tromey.com> In-Reply-To: <1478497656-11832-1-git-send-email-tom@tromey.com> References: <1478497656-11832-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c3cmU-0008A3-J1 X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:47918 X-Source-Auth: tom+tromey.com X-Email-Count: 11 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This changes call_doc_function to use gdbpy_reference. 2016-11-06 Tom Tromey * python/py-param.c (call_doc_function): Use gdbpy_reference. --- gdb/ChangeLog | 4 ++++ gdb/python/py-param.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9aa7008..9544515 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2016-11-06 Tom Tromey + * python/py-param.c (call_doc_function): Use gdbpy_reference. + +2016-11-06 Tom Tromey + * python/py-linetable.c (build_line_table_tuple_from_pcs) (ltpy_get_all_source_lines): Use gdbpy_reference. diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c index 3604f9f..dae2f7b 100644 --- a/gdb/python/py-param.c +++ b/gdb/python/py-param.c @@ -27,6 +27,7 @@ #include "completer.h" #include "language.h" #include "arch-utils.h" +#include "py-ref.h" /* Parameter constants and their values. */ struct parm_constant @@ -331,15 +332,14 @@ static char * call_doc_function (PyObject *obj, PyObject *method, PyObject *arg) { char *data = NULL; - PyObject *result = PyObject_CallMethodObjArgs (obj, method, arg, NULL); + gdbpy_reference result (PyObject_CallMethodObjArgs (obj, method, arg, NULL)); - if (! result) + if (result == NULL) return NULL; - if (gdbpy_is_string (result)) + if (gdbpy_is_string (result.get ())) { - data = python_string_to_host_string (result); - Py_DECREF (result); + data = python_string_to_host_string (result.get ()); if (! data) return NULL; } @@ -347,7 +347,6 @@ call_doc_function (PyObject *obj, PyObject *method, PyObject *arg) { PyErr_SetString (PyExc_RuntimeError, _("Parameter must return a string value.")); - Py_DECREF (result); return NULL; }