OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tc-score.c: Replace overlapping sprintf with memmove

Browse Source 
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.
This commit is contained in:
H.J. Lu 2020-05-26 06:09:54 -07:00
parent 40d22035a7
commit a05e3e2039
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -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

20
gas/config/tc-score.c
View File

@ -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));