* [PATCH] tc-score.c: Replace overlapping sprintf with memmove
@ 2020-05-26 13:11 H.J. Lu
0 siblings, 0 replies; only message in thread
From: H.J. Lu @ 2020-05-26 13:11 UTC (permalink / raw)
To: binutils
Fix GCC 10 warning:
gas/config/tc-score.c:4575:6: error: ‘sprintf’ argument 3 may overlap destination object ‘keep_data’ [-Werror=restrict]
4575 | sprintf (append_str, "bne %s", keep_data);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
PR gas/26044
* onfig/tc-score.c (s3_do_macro_bcmp): Replace overlapping
sprintf with memmove.
---
gas/ChangeLog | 6 ++++++
gas/config/tc-score.c | 20 ++++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7264c8a061..291a357b15 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-26 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR gas/26044
+ * onfig/tc-score.c (s3_do_macro_bcmp): Replace overlapping
+ sprintf with memmove.
+
2020-05-25 H.J. Lu <hongjiu.lu@intel.com>
* config/tc-mcore.c (md_convert_frag): Replace fragP->fr_literal
diff --git a/gas/config/tc-score.c b/gas/config/tc-score.c
index 80c4cbfa4e..72c5de8926 100644
--- a/gas/config/tc-score.c
+++ b/gas/config/tc-score.c
@@ -4537,9 +4537,10 @@ s3_do_macro_bcmp (char *str)
if (s3_append_insn (append_str, TRUE) == (int) s3_FAIL)
goto out;
if ((inst_main.instruction & 0x3e00007e) == 0x0000004c)
- sprintf (append_str, "beq %s", keep_data);
+ memcpy (append_str, "beq ", 4);
else
- sprintf (append_str, "bne %s", keep_data);
+ memcpy (append_str, "bne ", 4);
+ memmove (append_str + 4, keep_data, strlen (keep_data) + 1);
if (s3_append_insn (append_str, TRUE) == (int) s3_FAIL)
goto out;
}
@@ -4570,9 +4571,10 @@ s3_do_macro_bcmp (char *str)
memcpy (&inst_expand[0], &s3_inst, sizeof (struct s3_score_it));
if ((inst_main.instruction & 0x3e00007e) == 0x0000004c)
- sprintf (append_str, "beq %s", keep_data);
+ memcpy (append_str, "beq ", 4);
else
- sprintf (append_str, "bne %s", keep_data);
+ memcpy (append_str, "bne ", 4);
+ memmove (append_str + 4, keep_data, strlen (keep_data) + 1);
if (s3_append_insn (append_str, FALSE) == (int) s3_FAIL)
goto out;
memcpy (&inst_expand[1], &s3_inst, sizeof (struct s3_score_it));
@@ -4685,9 +4687,10 @@ s3_do_macro_bcmpz (char *str)
if (s3_append_insn (append_str, TRUE) == (int) s3_FAIL)
goto out;
if ((inst_main.instruction & 0x3e00007e) == 0x0000004c)
- sprintf (append_str, "beq %s", keep_data);
+ memcpy (append_str, "beq ", 4);
else
- sprintf (append_str, "bne %s", keep_data);
+ memcpy (append_str, "bne ", 4);
+ memmove (append_str + 4, keep_data, strlen (keep_data) + 1);
if (s3_append_insn (append_str, TRUE) == (int) s3_FAIL)
goto out;
}
@@ -4717,9 +4720,10 @@ s3_do_macro_bcmpz (char *str)
goto out;
memcpy (&inst_expand[0], &s3_inst, sizeof (struct s3_score_it));
if ((inst_main.instruction & 0x3e00007e) == 0x0000004c)
- sprintf (append_str, "beq %s", keep_data);
+ memcpy (append_str, "beq ", 4);
else
- sprintf (append_str, "bne %s", keep_data);
+ memcpy (append_str, "bne ", 4);
+ memmove (append_str + 4, keep_data, strlen (keep_data) + 1);
if (s3_append_insn (append_str, FALSE) == (int) s3_FAIL)
goto out;
memcpy (&inst_expand[1], &s3_inst, sizeof (struct s3_score_it));
--
2.26.2
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-05-26 13:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 13:11 [PATCH] tc-score.c: Replace overlapping sprintf with memmove H.J. Lu
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).