diff options
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/read.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index c89a192..6857bab 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2008-11-12 Hans-Peter Nilsson <hp@axis.com> + + * read.c (read_a_source_file): Rearrange evaluation order when + looking for '=' to avoid conditional on undefined contents of + input_line_pointer[1]. + 2008-11-06 Adam Nemet <anemet@caviumnetworks.com> * config/tc-mips.c (COP_INSN): Change logic to always return false @@ -791,10 +791,10 @@ read_a_source_file (char *name) /* Input_line_pointer->after ':'. */ SKIP_WHITESPACE (); } - else if (input_line_pointer[1] == '=' - && (c == '=' - || ((c == ' ' || c == '\t') - && input_line_pointer[2] == '='))) + else if ((c == '=' && input_line_pointer[1] == '=') + || ((c == ' ' || c == '\t') + && input_line_pointer[1] == '=' + && input_line_pointer[2] == '=')) { equals (s, -1); demand_empty_rest_of_line (); |