diff options
| author | Alan Modra <amodra@gmail.com> | 2015-02-05 09:14:56 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2015-02-05 09:44:55 +1030 |
| commit | 64a81db054a44e5539c4de5103125f3587de6403 (patch) | |
| tree | 1bb34bf6812d2ef65bb6414cb3e962def5e1b1e6 | |
| parent | b39b8b9d90e142179709e846c15afdebd49b0fb1 (diff) | |
| download | binutils-gdb-64a81db054a44e5539c4de5103125f3587de6403.tar.gz | |
Fix msp430 build with gcc-5
gcc-5 correctly complains "loop exit may only be reached after
undefined behavior". I was going to correct this by checking the
index before dereferencing the array rather than the other way around,
but then I noticed it is possible for extract_cmd to write the
terminating zero one past the end of "cmd". Fixing that means no
index check is needed in md_assemble.
* config/tc-msp430.c (md_assemble): Correct size passed to
extract_cmd. Remove index check.
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-msp430.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index f216b8498c0..f354c229ed0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2015-02-05 Alan Modra <amodra@gmail.com> + + * config/tc-msp430.c (md_assemble): Correct size passed to + extract_cmd. Remove index check. + 2015-02-04 Matthew Wahab <matthew.wahab@arm.com> * config/tc-aarch64.c (aarch64_cpus): Add support for Cortex-A72. diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c index e44e7b2602b..2891c13277e 100644 --- a/gas/config/tc-msp430.c +++ b/gas/config/tc-msp430.c @@ -3174,9 +3174,9 @@ md_assemble (char * str) unsigned int i = 0; str = skip_space (str); /* Skip leading spaces. */ - str = extract_cmd (str, cmd, sizeof (cmd)); + str = extract_cmd (str, cmd, sizeof (cmd) - 1); - while (cmd[i] && i < sizeof (cmd)) + while (cmd[i]) { char a = TOLOWER (cmd[i]); cmd[i] = a; |