From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23614 invoked by alias); 14 Aug 2017 03:41:22 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 4218 invoked by uid 89); 14 Aug 2017 03:40:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=management X-HELO: gproxy6-pub.mail.unifiedlayer.com Received: from gproxy6-pub.mail.unifiedlayer.com (HELO gproxy6-pub.mail.unifiedlayer.com) (67.222.39.168) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 14 Aug 2017 03:40:43 +0000 Received: from cmgw2 (unknown [10.0.90.83]) by gproxy6.mail.unifiedlayer.com (Postfix) with ESMTP id E1DF91E0727 for ; Sun, 13 Aug 2017 21:40:41 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id wrge1v00p2f2jeq01rghTP; Sun, 13 Aug 2017 21:40:41 -0600 X-Authority-Analysis: v=2.2 cv=T7z8d7CQ c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=KeKAF7QvOSUA:10 a=zstS-IiYAAAA:8 a=Xdrg6Xfu4bCAZ9hFK2wA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-24-97.hlrn.qwest.net ([75.166.24.97]:55932 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dh6F4-0025eE-NZ; Sun, 13 Aug 2017 21:40:38 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v2 05/13] Avoid manual resource management in py-framefilter.c Date: Mon, 14 Aug 2017 03:41:00 -0000 Message-Id: <20170814034030.20863-6-tom@tromey.com> In-Reply-To: <20170814034030.20863-1-tom@tromey.com> References: <20170814034030.20863-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1dh6F4-0025eE-NZ X-Source-Sender: 75-166-24-97.hlrn.qwest.net (bapiya.Home) [75.166.24.97]:55932 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-SW-Source: 2017-08/txt/msg00281.txt.bz2 This patch removes the last bit of manual resource management from py-framefilter.c. This will be useful in the next patch. ChangeLog 2017-08-13 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/ChangeLog b/gdb/ChangeLog index 08fb316..dc4c39f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2017-08-13 Tom Tromey + * python/py-framefilter.c (enumerate_args): Use + gdb::unique_xmalloc_ptr. + +2017-08-13 Tom Tromey + * python/py-framefilter.c (py_print_frame): Return EXT_LANG_BT_OK. (gdbpy_apply_frame_filter): Update comment. diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 2bbbfbe..2ae2158 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 { -- 2.9.4