From patchwork Fri Dec 10 16:21:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 48790 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D03953858020 for ; Fri, 10 Dec 2021 16:22:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D03953858020 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1639153350; bh=RuP5REo2otQxTRAmUn5pOM62YNXTskbCHPU7eKP6Q6o=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rqPh+/A7OVsKjzyybmbujORp09P1grePlbuYfwRPJBYGqH0leEpu6tabKzxtvPpjN NgBKFeczGVD/Yr2tfNIPtXO8d5IZrPGfT2qjaP5Ar7ZUWJ97JZ2oR/HGzBI7QcFb8b +PQmzSkIxL4goDJrr+8w+5eEIfz1adALBvMUMT2c= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 271303858020 for ; Fri, 10 Dec 2021 16:22:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 271303858020 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-557-2mILvTsCM1aXtkqoQGr0sQ-1; Fri, 10 Dec 2021 11:21:59 -0500 X-MC-Unique: 2mILvTsCM1aXtkqoQGr0sQ-1 Received: by mail-qk1-f198.google.com with SMTP id de12-20020a05620a370c00b00467697ab8a7so10745792qkb.9 for ; Fri, 10 Dec 2021 08:21:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RuP5REo2otQxTRAmUn5pOM62YNXTskbCHPU7eKP6Q6o=; b=wMvwg5rycBO48qH6zpwZHz4X45Nhw7kmFBrxPpncADTxj/HW7eZnCRK1QWlXasCYEf 2D1BH2XZrcgSOEsNAscs1zGrRK5WWXlg26MWvrt8bxkElqMHNyG+4mfKthzxU3Ixk0b8 LNPqRmiAN1h3hM1o1835GX7qAvUJBXpqye8c+TfPvdLSVPKBFHwOaAbnjiqpbdqHvsmi PgnLP9HEVizhJ4wA5nxWe6zd+ijhdFOxDzsfVLLDxr+yTvOoGWBsrXH4Vie7IyQnxhBQ 8zrxIrCEFia3CFzi15kNmSYC41jicA/FuUjuUKB5PT9LUe6qVgUAvkGjDMxxgq7rRytt xkCQ== X-Gm-Message-State: AOAM531fOPgx+9sOzo2I6Urrg6qCAd09f3G5wBhOARWVeuGp/1GlyNDc ze8sj/v9jM+naeY8Bhe9PzNJVDYMI5LxAodfuooL6mXqmcsPokhoSczuNnu17XCif1eGywSqglL X6PScQNtqpFRGnjTmLjygqpHMqKcXtXgck6DV7CmLE8YMBva7l98LyPyZ9H/nJ2ebteM= X-Received: by 2002:ad4:5e8b:: with SMTP id jl11mr27445883qvb.18.1639153318786; Fri, 10 Dec 2021 08:21:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyut7S57SfUMFhZAC2lEZ8nK+9aRCcJReTj2wasuVqVuqgxF/SIxniMghKEOjEpbAfN2c7+5w== X-Received: by 2002:ad4:5e8b:: with SMTP id jl11mr27445849qvb.18.1639153318521; Fri, 10 Dec 2021 08:21:58 -0800 (PST) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id k23sm1957122qtm.49.2021.12.10.08.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 08:21:57 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: don't leak 'arglist' in build_new_op Date: Fri, 10 Dec 2021 11:21:56 -0500 Message-Id: <20211210162156.3337828-1-ppalka@redhat.com> X-Mailer: git-send-email 2.34.1.75.gabe6bb3905 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" 'arglist' can be captured by a conversion within 'candidates', but if we use a releasing_vec then we'll be sure to free it only after 'candidates' is freed by obstack_free. Bootstrapped and regtested in x86_64-pc-linux-gnu, does this look OK for trunk? gcc/cp/ChangeLog: * call.c (build_new_op): Use releasing_vec for arglist. Declare conv in the scope it's used. --- gcc/cp/call.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 28bd8e0c260..347df5da35d 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -6461,13 +6461,12 @@ build_new_op (const op_location_t &loc, enum tree_code code, int flags, tsubst_flags_t complain) { struct z_candidate *candidates = 0, *cand; - vec *arglist; + releasing_vec arglist; tree result = NULL_TREE; bool result_valid_p = false; enum tree_code code2 = ERROR_MARK; enum tree_code code_orig_arg1 = ERROR_MARK; enum tree_code code_orig_arg2 = ERROR_MARK; - conversion *conv; void *p; bool strict_p; bool any_viable_p; @@ -6543,7 +6542,6 @@ build_new_op (const op_location_t &loc, enum tree_code code, int flags, arg2_type = integer_type_node; } - vec_alloc (arglist, 3); arglist->quick_push (arg1); if (arg2 != NULL_TREE) arglist->quick_push (arg2); @@ -6814,7 +6812,7 @@ build_new_op (const op_location_t &loc, enum tree_code code, int flags, corresponding parameters of the selected operation function, except that the second standard conversion sequence of a user-defined conversion sequence (12.3.3.1.2) is not applied." */ - conv = cand->convs[0]; + conversion *conv = cand->convs[0]; if (conv->user_conv_p) { conv = strip_standard_conversion (conv);