From: H.J. Lu <hjl@sourceware.org>
To: binutils-cvs@sourceware.org
Subject: [binutils-gdb] x86: Fix a memory leak in md_assemble
Date: Tue, 16 Apr 2024 13:34:44 +0000 (GMT) [thread overview]
Message-ID: <20240416133444.6CD4C3858D35@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2d4c39a885d4d12325d0a9be9e014e75a295fb25
commit 2d4c39a885d4d12325d0a9be9e014e75a295fb25
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Apr 9 16:01:16 2024 -0700
x86: Fix a memory leak in md_assemble
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.
Diff:
---
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 56b2431b1bc..1637f55759c 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -6515,6 +6515,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;
@@ -6553,10 +6554,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;
@@ -6565,7 +6568,7 @@ md_assemble (char *line)
this_operand = -1;
if (line == NULL)
{
- free (copy);
+ free (xstrdup_copy);
return;
}
@@ -6650,7 +6653,7 @@ md_assemble (char *line)
pass1_mnem = NULL;
match_error:
- free (copy);
+ free (xstrdup_copy);
switch (pass1_mnem ? pass1_err : i.error)
{
@@ -6782,7 +6785,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
reply other threads:[~2024-04-16 13:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240416133444.6CD4C3858D35@sourceware.org \
--to=hjl@sourceware.org \
--cc=binutils-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).