diff options
| author | Wu Heng <wu.heng@zte.com.cn> | 2019-01-25 13:41:47 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2019-01-25 14:59:42 +1030 |
| commit | 10c172ba93dde7cb7c46982ca217e646565bf938 (patch) | |
| tree | b1f331f272e017c40d7cb187fa85c5248de77e98 | |
| parent | 04174263401c670b5faaaec452aee2df92130ef9 (diff) | |
| download | binutils-gdb-10c172ba93dde7cb7c46982ca217e646565bf938.tar.gz | |
PR23940, check bounds before using
PR gas/23940
* macro.c (getstring): Check array bound before accessing.
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/macro.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index a930a842424..50eea849d00 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2019-01-25 Wu Heng <wu.heng@zte.com.cn> + + PR gas/23940 + * macro.c (getstring): Check array bound before accessing. + 2019-01-25 Alan Modra <amodra@gmail.com> PR 20902 diff --git a/gas/macro.c b/gas/macro.c index 68ae04b010b..5f41c13cb80 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -285,8 +285,8 @@ getstring (size_t idx, sb *in, sb *acc) { int nest = 0; idx++; - while ((in->ptr[idx] != '>' || nest) - && idx < in->len) + while (idx < in->len + && (in->ptr[idx] != '>' || nest)) { if (in->ptr[idx] == '!') { |