diff options
| author | Alan Modra <amodra@gmail.com> | 2010-08-25 11:51:07 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2010-08-25 11:51:07 +0000 |
| commit | 4ad7ac30ca9fdb05146eb68f324001e30765ad27 (patch) | |
| tree | 492314b6b2bbbf70d6f9cefd40278908fe253e0a | |
| parent | ca09d69af126b596bf21c9d3f7639cae5cd32533 (diff) | |
| download | gdb-4ad7ac30ca9fdb05146eb68f324001e30765ad27.zip gdb-4ad7ac30ca9fdb05146eb68f324001e30765ad27.tar.gz gdb-4ad7ac30ca9fdb05146eb68f324001e30765ad27.tar.bz2 | |
* config/tc-d10v.c (do_assemble): Correctly detect overflow of
"name" buffer.
* config/tc-m68hc11.c (md_assemble): Likewise.
* config/tc-microblaze.c (md_assemble): Likewise. Correct cast
of is_end_of_line index.
| -rw-r--r-- | gas/ChangeLog | 8 | ||||
| -rw-r--r-- | gas/config/tc-d10v.c | 6 | ||||
| -rw-r--r-- | gas/config/tc-m68hc11.c | 4 | ||||
| -rw-r--r-- | gas/config/tc-microblaze.c | 4 |
4 files changed, 18 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index f546911..3f4d9d2 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2010-08-25 Alan Modra <amodra@gmail.com> + + * config/tc-d10v.c (do_assemble): Correctly detect overflow of + "name" buffer. + * config/tc-m68hc11.c (md_assemble): Likewise. + * config/tc-microblaze.c (md_assemble): Likewise. Correct cast + of is_end_of_line index. + 2010-08-25 Jie Zhang <jie@codesourcery.com> * config/tc-arm.c (encode_arm_addr_mode_2): Fix comment. diff --git a/gas/config/tc-d10v.c b/gas/config/tc-d10v.c index d0c3129..8ba4f30 100644 --- a/gas/config/tc-d10v.c +++ b/gas/config/tc-d10v.c @@ -1,6 +1,6 @@ /* tc-d10v.c -- Assembler code for the Mitsubishi D10V Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, - 2007, 2009 + 2007, 2009, 2010 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -1420,11 +1420,13 @@ do_assemble (char *str, struct d10v_opcode **opcode) /* Find the opcode end. */ for (op_start = op_end = (unsigned char *) str; - *op_end && nlen < 20 && !is_end_of_line[*op_end] && *op_end != ' '; + *op_end && !is_end_of_line[*op_end] && *op_end != ' '; op_end++) { name[nlen] = TOLOWER (op_start[nlen]); nlen++; + if (nlen == sizeof (name) - 1) + break; } name[nlen] = 0; diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c index c314961..2e328ea 100644 --- a/gas/config/tc-m68hc11.c +++ b/gas/config/tc-m68hc11.c @@ -2403,11 +2403,13 @@ md_assemble (char *str) /* Find the opcode end and get the opcode in 'name'. The opcode is forced lower case (the opcode table only has lower case op-codes). */ for (op_start = op_end = (unsigned char *) str; - *op_end && nlen < 20 && !is_end_of_line[*op_end] && *op_end != ' '; + *op_end && !is_end_of_line[*op_end] && *op_end != ' '; op_end++) { name[nlen] = TOLOWER (op_start[nlen]); nlen++; + if (nlen == sizeof (name) - 1) + break; } name[nlen] = 0; diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c index e1c4953..7c6357e 100644 --- a/gas/config/tc-microblaze.c +++ b/gas/config/tc-microblaze.c @@ -807,11 +807,13 @@ md_assemble (char * str) /* Find the op code end. */ for (op_start = op_end = str; - * op_end && nlen < 20 && !is_end_of_line [(int)*op_end] && *op_end != ' '; + *op_end && !is_end_of_line[(unsigned char) *op_end] && *op_end != ' '; op_end++) { name[nlen] = op_start[nlen]; nlen++; + if (nlen == sizeof (name) - 1) + break; } name [nlen] = 0; |