diff options
| author | Chen Gang <gang.chen.5i5j@gmail.com> | 2014-10-15 09:48:47 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2014-10-28 16:38:04 +1030 |
| commit | b257b190e067a5153203c87abd7cadde4cd0c8be (patch) | |
| tree | f1afc2002f7b4631ea6383128f35259d7b87bdde /gas | |
| parent | 625797b3dc84d9ea9a6a28bbfa084ebb65beef0a (diff) | |
| download | binutils-b257b190e067a5153203c87abd7cadde4cd0c8be.tar.gz binutils-b257b190e067a5153203c87abd7cadde4cd0c8be.tar.bz2 binutils-b257b190e067a5153203c87abd7cadde4cd0c8be.zip | |
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/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-tic4x.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 3e3384e3ce8..b265f73dd9c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2014-10-28 Alan Modra <amodra@gmail.com> + + Apply trunk patches + 2014-10-15 Chen Gang <gang.chen.5i5j@gmail.com> + * config/tc-tic4x.c (md_assemble): Correct strncat size. + 2014-10-15 Tristan Gingold <gingold@adacore.com> * configure: Regenerate. diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c index 904a68c849e..dc821680739 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; |