From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id DDCE13870C3D for ; Tue, 9 Apr 2024 23:01:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DDCE13870C3D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DDCE13870C3D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712703683; cv=none; b=pNlOb2q+WZFBotHqaAmOXSn7C2slG1Yg3G5VJKYq7V3iKG91wNLcL00bMeRQfi3LCqabKjU0yiNWNmabsF8xXjiaszI9o/yd044v53iJt+HJxaByTGxUhqc2wj7w4CZciqk31EAVXjhSLAAKumJuntSihijIJs4J2X19f/5eyrE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712703683; c=relaxed/simple; bh=MAAYG2ExFliy3roLcyDhPdZX6hKPq8sSHPotXYovAwM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AWyl7Y2py3rTLb5eraPM9CUFJBDHePOGSpn487faOn2QE+1XwxgtDa7CnI6/FdwIIynsOl3WA/snpRd4wdIpO9CCi9URFpn1Z5EbDrGrx0RtGfBjzfNlai1U/jXYwL+gg5Ph+8OuBzspwcgeH2i1J+AHrY2+SxOPxluwoodTyw4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1e3e84a302eso23169805ad.0 for ; Tue, 09 Apr 2024 16:01:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712703678; x=1713308478; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=qbomPEmX0TPC0+NA918dFLWzauh/zX8IJKVqI+ohHyY=; b=DqIKcztQzB68L72EM1otojy4JhcklQKa2a4axouV3v7sTxobyVp87oNaVwCwnsYzph lhKkjpcQZEXMPVS7Y8Lf/TOZFgtQ/DqHL90uGgAp6upg3d1K/nA0R15WU9aGrVkC07mC qdXqcVV/UOJ4sNeLarMJEIJtHtw5TyDdYzg0/RGO1dXi5FZnKc3d+t2boUfqyi1erfBS K8Lo1tOtGL4HzUXoN2b13HN0RYgS9GLtW6VxZRfl7xLpREvL/3tMvSXr6zGTGBpejIHj noE+5YfxPkOvrWdwvks/s2olp+E4ydqgVhj+BrXOPXunTvk9WX8wZ5QBbhGmI6+3kzsv bu6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712703678; x=1713308478; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qbomPEmX0TPC0+NA918dFLWzauh/zX8IJKVqI+ohHyY=; b=njw+y5k82Komjkg6OZuMbYEGHtbQV79JPwbG/Ch+qgF0ZpZD88dD9m3MSLw9/dTubG fRjAKb5sxtJ/fNj5qDtkwzl8UyI/Y6NPOofSr2+E9yKfNbLcX28ncpr0HOi57AFabYRE PAMll0hbqKzI5SQPKvN7YsynB923rvH7tXoIs8oAJ620hNcFjcrnR9mOHSfqRBXkaKth PmUrVZKvJMITRm2xtiUtQuNDcuFmDWmt8UzNxInfMtzLUoGVdukWAksrZoVdO8UEzvBt hJBO/lYSlKIXlLgWWtmpnARMxWkT0UZb4it07D/FgWLgfuP1k/BQvYcPfFe8yMFYvBGP Pfbw== X-Gm-Message-State: AOJu0Yw1Pnc/WNh61SeUFnbXbBtioBPLXD0LSbzR7ejJh8pH60S/p9E8 5xhv1E930II8qVQkXSYTCTKGHe8mgB4v/4zK58/H1zAUtpNWpkZiwo1mfQJc X-Google-Smtp-Source: AGHT+IHGDn0OPmfueJA5gLAa1HDFiP1lcEnmlXvERw1dYnU767mr0wP6ri8XA6TCTcznn5dq1FDDvQ== X-Received: by 2002:a17:903:13d0:b0:1e3:dfdb:ac6b with SMTP id kd16-20020a17090313d000b001e3dfdbac6bmr1427488plb.4.1712703678195; Tue, 09 Apr 2024 16:01:18 -0700 (PDT) Received: from gnu-cfl-3.localdomain ([172.56.169.48]) by smtp.gmail.com with ESMTPSA id a5-20020a170902ee8500b001e088a9e2bcsm9483639pld.292.2024.04.09.16.01.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 16:01:17 -0700 (PDT) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 9175574019D for ; Tue, 9 Apr 2024 16:01:16 -0700 (PDT) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH] x86: Fix a memory leak in md_assemble Date: Tue, 9 Apr 2024 16:01:16 -0700 Message-ID: <20240409230116.2455885-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3020.3 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,RCVD_IN_SBL_CSS,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 List-Id: Fix a memory leak in md_assemble where copy may be cleared and may be the same as copy: if (copy && !mnem_suffix) { line = copy; copy = NULL; no_match: * config/tc-i386.c (md_assemble): Properly free the xstrdup memory. --- gas/config/tc-i386.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 8f6337b34af..502cc1b6978 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -6485,6 +6485,7 @@ md_assemble (char *line) { unsigned int j; char mnemonic[MAX_MNEM_SIZE], mnem_suffix = 0, *copy = NULL; + char *xstrdup_copy = NULL; const char *end, *pass1_mnem = NULL; enum i386_error pass1_err = 0; const insn_template *t; @@ -6523,10 +6524,12 @@ md_assemble (char *line) return; } t = current_templates.start; - if (may_need_pass2 (t)) + /* NB: LINE may be change to be the same as XSTRDUP_COPY. */ + if (xstrdup_copy != line && may_need_pass2 (t)) { /* Make a copy of the full line in case we need to retry. */ - copy = xstrdup (line); + xstrdup_copy = xstrdup (line); + copy = xstrdup_copy; } line += end - line; mnem_suffix = i.suffix; @@ -6535,7 +6538,7 @@ md_assemble (char *line) this_operand = -1; if (line == NULL) { - free (copy); + free (xstrdup_copy); return; } @@ -6620,7 +6623,7 @@ md_assemble (char *line) pass1_mnem = NULL; match_error: - free (copy); + free (xstrdup_copy); switch (pass1_mnem ? pass1_err : i.error) { @@ -6752,7 +6755,7 @@ md_assemble (char *line) return; } - free (copy); + free (xstrdup_copy); if (sse_check != check_none /* The opcode space check isn't strictly needed; it's there only to -- 2.44.0