From patchwork Fri Mar 23 20:55:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 26446 Received: (qmail 17097 invoked by alias); 23 Mar 2018 20:55:20 -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 16973 invoked by uid 89); 23 Mar 2018 20:55:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1780, management X-HELO: gateway36.websitewelcome.com Received: from gator3089.hostgator.com (HELO gateway36.websitewelcome.com) (192.185.200.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Mar 2018 20:55:17 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 9FABF400D6A93 for ; Fri, 23 Mar 2018 15:55:16 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id zTiWebNffQUwqzTiWeS0tt; Fri, 23 Mar 2018 15:55:16 -0500 Received: from 174-29-60-18.hlrn.qwest.net ([174.29.60.18]:33476 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1ezTiW-001cSz-E6; Fri, 23 Mar 2018 15:55:16 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v3 05/13] Avoid manual resource management in py-framefilter.c Date: Fri, 23 Mar 2018 14:55:04 -0600 Message-Id: <20180323205512.14434-6-tom@tromey.com> In-Reply-To: <20180323205512.14434-1-tom@tromey.com> References: <20180323205512.14434-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1ezTiW-001cSz-E6 X-Source-Sender: 174-29-60-18.hlrn.qwest.net (bapiya.Home) [174.29.60.18]:33476 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes This patch removes the last bit of manual resource management from py-framefilter.c. This will be useful in the next patch. gdb/ChangeLog 2018-03-23 Tom Tromey * python/py-framefilter.c (enumerate_args): Use gdb::unique_xmalloc_ptr. --- gdb/ChangeLog | 5 +++++ gdb/python/py-framefilter.c | 20 +++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 1dc15ae14e..dcac42df8e 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -560,6 +560,9 @@ enumerate_args (PyObject *iter, } END_CATCH + gdb::unique_xmalloc_ptr arg_holder (arg.error); + gdb::unique_xmalloc_ptr entry_holder (entryarg.error); + /* The object has not provided a value, so this is a frame argument to be read by GDB. In this case we have to account for entry-values. */ @@ -571,11 +574,7 @@ enumerate_args (PyObject *iter, args_type, print_args_field, NULL) == EXT_LANG_BT_ERROR) - { - xfree (arg.error); - xfree (entryarg.error); - return EXT_LANG_BT_ERROR; - } + return EXT_LANG_BT_ERROR; } if (entryarg.entry_kind != print_entry_values_no) @@ -589,8 +588,6 @@ enumerate_args (PyObject *iter, } CATCH (except, RETURN_MASK_ALL) { - xfree (arg.error); - xfree (entryarg.error); gdbpy_convert_exception (except); return EXT_LANG_BT_ERROR; } @@ -600,15 +597,8 @@ enumerate_args (PyObject *iter, if (py_print_single_arg (out, NULL, &entryarg, NULL, &opts, args_type, print_args_field, NULL) == EXT_LANG_BT_ERROR) - { - xfree (arg.error); - xfree (entryarg.error); - return EXT_LANG_BT_ERROR; - } + return EXT_LANG_BT_ERROR; } - - xfree (arg.error); - xfree (entryarg.error); } else {