From patchwork Tue Mar 21 22:40:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 73096 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2045544wrt; Tue, 21 Mar 2023 15:40:31 -0700 (PDT) X-Google-Smtp-Source: AK7set/H2j5NReqEfltc0rd/rcro/B4DHXCv80U63LyZllfd7vI3qvHftmc4AgE9IPiRtZr6h1vQ X-Received: by 2002:aa7:cac8:0:b0:4ac:bd84:43d9 with SMTP id l8-20020aa7cac8000000b004acbd8443d9mr4791003edt.2.1679438431273; Tue, 21 Mar 2023 15:40:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679438431; cv=none; d=google.com; s=arc-20160816; b=c1ZU7iO0idg5rKRRt+BX9H+BvJc/ZwlZ+w7wmZSzdbVRxDK/XQdPG5+lXif6YGzO+d jomiV5FFhRoupqjJw/0OiS6dqCWdc/h7VMDRf3GSBAvatOARspnPZF/7cL0I4hQZmPWI eZIfFFtm58SWmT2vyfeMNuF3e4GEMnuSEnrwiniomWcGP8+VDSHNnACrxLsQcuVYRIn/ PrOIo7GeCAsySqAeeDPiBbmNZt9WCTmWn8e/6AmYTfJrCXA7fHUNPqjxgxRliK9DiEY4 5F8qiWMrfBDpXSTd8l9Egav7vRZbJU5MEdZ1+11dy3gpm5X04ca3k4PhcmJkpKdx/pxn bnYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=43agARsVLYJrLxFSROwo5jSQGDi98XopvKrs4PPiq5Y=; b=onEfYGPcBYzWIqpT1etXEqBZLrCmgtU/GAUnTkwXLWCEQwK9QeT4mm+g4goGy7kMqQ WgQWagmPt+/blHywy0uDtVpCyqVFukJXshpwZ3Xqy04WYNgqaUywMOAp7zzW6u7fwVCW sK05348lXL3eOc4unbtk9JySl10rCE/lXZdCmU2JemKCabppbP0zW3L/xwMQ+DnN94aj W5rR9suGQ9dHUWhOqaYJgKG3kU1pRrpZutZlePOfiuE51bneK+EZATkfZKuTHgFsj3q8 sU/UbcyL5SXEmsnKtHLnsTXN15rR9aanDEBWzwnhBC9/dRQbRurZwDEGt/cSyMwFTaci 1tcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=FChAfgvX; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b6-20020aa7df86000000b004acdca4cb9asi14526196edy.636.2023.03.21.15.40.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 15:40:31 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=FChAfgvX; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 49D3C38515EC for ; Tue, 21 Mar 2023 22:40:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 49D3C38515EC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679438427; bh=43agARsVLYJrLxFSROwo5jSQGDi98XopvKrs4PPiq5Y=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FChAfgvXCgkMgJPgYzrGfXo9bZo5v1LFZZJB8rZfX0SfPgsNyf7A5q9cnRUrDcvdv 7o+tvFrm8IbKPU8WpC+eio5e8d/Nsw1VysnXe1CQ0Z0BaYmDyrcwx6clk0atPE6/f+ 0pSRfDhUN1lHfk0zWV3+ZI4JIk1t7MJ/jK5n5FBk= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by sourceware.org (Postfix) with ESMTPS id F2AE93858D3C for ; Tue, 21 Mar 2023 22:40:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F2AE93858D3C Received: by mail-pj1-x102b.google.com with SMTP id lr16-20020a17090b4b9000b0023f187954acso17401439pjb.2 for ; Tue, 21 Mar 2023 15:40:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679438415; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=43agARsVLYJrLxFSROwo5jSQGDi98XopvKrs4PPiq5Y=; b=N+aNR6nDky9DgyvGEWSwydagtwYlB3WUnFfgj4HsmAfzLKHH4sqp2+RML4DFrERMGc 5XmGm5peYTGW2j5iHReAAQcpn32q4VDua4Y26PwX8TzBocfFriurqimOU6bXUig1wr4S c1WtramkTsRNWpmCQMDgePzJT9PLJCf9KAtsE0benGm4mZOLbGCj6sxYm/SrHGz6IIbF Ex+yPm4EZIr9NlKYwCNYDyKDEKGw8KWKZE7JeoNNU6c4O7T2aJnXJ6lMZ46aKxgp6+VV BiV/s17oxBqfGuklcfL3AUo5o81FcLOMk3X2PQrshXAHzqHabefUxy2v3xXglktz8FuK /KIw== X-Gm-Message-State: AO0yUKU26Xms5CLwbljNSv1TFQytGZ5w6xtyTOjs3BHmJLmWv6Gz/AlT quCakkUZWAZ1yp+L1k4oYMsQ3vLpSy0= X-Received: by 2002:a17:903:210a:b0:19a:f02c:a06d with SMTP id o10-20020a170903210a00b0019af02ca06dmr506684ple.29.1679438414610; Tue, 21 Mar 2023 15:40:14 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id a13-20020a170902ee8d00b0019f11a68c42sm9138897pld.297.2023.03.21.15.40.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 15:40:14 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 2DD611142A6A; Wed, 22 Mar 2023 09:10:11 +1030 (ACDT) Date: Wed, 22 Mar 2023 09:10:11 +1030 To: binutils@sourceware.org Subject: gas: expand_irp memory leaks Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3035.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761018832744336716?= X-GMAIL-MSGID: =?utf-8?q?1761018832744336716?= * macro.c (expand_irp): Free memory on error return paths. diff --git a/gas/macro.c b/gas/macro.c index 948d76d5bac..c5959f674dd 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -1320,7 +1320,10 @@ expand_irp (int irpc, size_t idx, sb *in, sb *out, size_t (*get_line) (sb *)) sb_new (&sub); if (! buffer_and_nest (NULL, "ENDR", &sub, get_line)) - return _("unexpected end of file in irp or irpc"); + { + err = _("unexpected end of file in irp or irpc"); + goto out2; + } sb_new (&f.name); sb_new (&f.def); @@ -1328,7 +1331,10 @@ expand_irp (int irpc, size_t idx, sb *in, sb *out, size_t (*get_line) (sb *)) idx = get_token (idx, in, &f.name); if (f.name.len == 0) - return _("missing model parameter"); + { + err = _("missing model parameter"); + goto out1; + } h = str_htab_create (); @@ -1392,9 +1398,11 @@ expand_irp (int irpc, size_t idx, sb *in, sb *out, size_t (*get_line) (sb *)) } htab_delete (h); + out1: sb_kill (&f.actual); sb_kill (&f.def); sb_kill (&f.name); + out2: sb_kill (&sub); return err;