From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 313 invoked by alias); 18 Jul 2018 19:34:14 -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 131059 invoked by uid 89); 18 Jul 2018 19:34:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-7.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1871 X-HELO: gateway30.websitewelcome.com Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (192.185.160.12) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 18 Jul 2018 19:34:11 +0000 Received: from cm15.websitewelcome.com (cm15.websitewelcome.com [100.42.49.9]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 671D5DC61 for ; Wed, 18 Jul 2018 14:34:10 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fsClfLmAjbXuJfsD0fTTKY; Wed, 18 Jul 2018 14:34:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EnT4H1Z4kknT0nwwFR5CiOMRbK925DgPn4DxO5ZzlVc=; b=fjqRLA1+Ghl/wyZGY146TupMLC Th2T2BYy4RKAW8Ns7u211rSY/2Hq9FsEIEJZKUUJtFjiAmpwzjAI0KtNvcPYDWSg+n5sYahMwNRVO 6jSXQlFLjK9gro5Sfa4TFpT6j; Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:46022 helo=bapiya) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1ffsCl-00224E-9E; Wed, 18 Jul 2018 14:33:43 -0500 From: Tom Tromey To: Pedro Alves Cc: Tom Tromey , gdb-patches@sourceware.org Subject: Re: [RFC] gdbscm_wrap, eliminate GDBSCM_HANDLE_GDB_EXCEPTION_WITH_CLEANUPS (Re: [RFA 2/4] Change gdbscm_exception_message_to_string to return a unique_xmalloc_ptr) References: <20180527152009.4228-1-tom@tromey.com> <20180527152009.4228-3-tom@tromey.com> <4f3db9e6-4c5a-c29c-46ab-8ce6e1032b3a@redhat.com> <87601dznj3.fsf@tromey.com> <191b7d63-3e83-6bc2-39d6-98a84f3aae27@redhat.com> Date: Wed, 18 Jul 2018 19:34:00 -0000 In-Reply-To: <191b7d63-3e83-6bc2-39d6-98a84f3aae27@redhat.com> (Pedro Alves's message of "Wed, 18 Jul 2018 14:28:51 +0100") Message-ID: <87y3e849ux.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2018-07/txt/msg00565.txt.bz2 >>>>> "Pedro" == Pedro Alves writes: Pedro> I gave this a try today. How about this? Pedro> +/* Use this to wrap a callable to throw the appropriate Scheme Pedro> + exception if the callable throws a GDB error. ARGS are forwarded Pedro> + to FUNC. Returns the result of FUNC, unless FUNC returns a Scheme Pedro> + exception, in which case that exception is thrown. Note that while Pedro> + the callable is free is use objects of types with destructors, Typo - "free to use objects". Pedro> +++ b/gdb/guile/scm-frame.c Pedro> @@ -783,13 +783,11 @@ gdbscm_frame_read_register (SCM self, SCM register_scm) Pedro> char *register_str; Pedro> struct value *value = NULL; Pedro> struct frame_info *frame = NULL; Pedro> - struct cleanup *cleanup; Pedro> frame_smob *f_smob; Pedro> f_smob = frscm_get_frame_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); Pedro> gdbscm_parse_function_args (FUNC_NAME, SCM_ARG2, NULL, "s", Pedro> register_scm, ®ister_str); Pedro> - cleanup = make_cleanup (xfree, register_str); Pedro> TRY Pedro> { Pedro> @@ -811,7 +809,7 @@ gdbscm_frame_read_register (SCM self, SCM register_scm) Pedro> } Pedro> END_CATCH Pedro> - do_cleanups (cleanup); Pedro> + xfree (register_str); I think this will leak register_str if anything throws. Maybe the xfree should be duplicated in the catch block, or maybe the whole try/catch should be replaced with a call to gdbscm_wrap (where the callback would take ownership of register_str). This seems like a latent bug here as well - I think the code should be using GDBSCM_HANDLE_GDB_EXCEPTION_WITH_CLEANUPS here. Otherwise this all looks good to me. Thanks for doing this, guile was one of the larger cleanup holdouts Tom