aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorChen Gang <gang.chen.5i5j@gmail.com>2014-10-15 09:48:47 +1030
committerAlan Modra <amodra@gmail.com>2014-10-15 09:56:54 +1030
commit450ccef08d3a35300c9ebeee71df96b9c56ca0b0 (patch)
tree64485f614e5f4669a0927025a62749998790bfca /gas
parent45229ecbba96f9f07b3b80c1e3bbc93d38017c17 (diff)
downloadgdb-450ccef08d3a35300c9ebeee71df96b9c56ca0b0.zip
gdb-450ccef08d3a35300c9ebeee71df96b9c56ca0b0.tar.gz
gdb-450ccef08d3a35300c9ebeee71df96b9c56ca0b0.tar.bz2
Fix memory overflow issue about strncat
If src contains n or more bytes, strncat() writes n+1 bytes to dest (n from src plus the terminating null byte). Therefore, the size of dest must be at least strlen(dest)+n+1. * config/tc-tic4x.c (md_assemble): Correct strncat size.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-tic4x.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4047623..7ac3677 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-15 Chen Gang <gang.chen.5i5j@gmail.com>
+
+ * config/tc-tic4x.c (md_assemble): Correct strncat size.
+
2014-10-14 Tristan Gingold <gingold@adacore.com>
* NEWS: Add marker for 2.25.
diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
index 904a68c..dc82168 100644
--- a/gas/config/tc-tic4x.c
+++ b/gas/config/tc-tic4x.c
@@ -2456,7 +2456,7 @@ md_assemble (char *str)
if (*s) /* Null terminate for hash_find. */
*s++ = '\0'; /* and skip past null. */
strcat (insn->name, "_");
- strncat (insn->name, str, TIC4X_NAME_MAX - strlen (insn->name));
+ strncat (insn->name, str, TIC4X_NAME_MAX - 1 - strlen (insn->name));
insn->operands[insn->num_operands++].mode = M_PARALLEL;