diff options
| author | Alan Modra <amodra@gmail.com> | 2022-02-15 14:35:14 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-02-16 19:15:40 +1030 |
| commit | d12b8d620c6aba8e0bf650549949fec1d208a683 (patch) | |
| tree | e5150238347029fdc3061903fa20735a26e2ded7 /gas/macro.c | |
| parent | fe69d4fcf0194a37a151f513e56ec31e106f3002 (diff) | |
| download | fsf-binutils-gdb-d12b8d620c6aba8e0bf650549949fec1d208a683.zip fsf-binutils-gdb-d12b8d620c6aba8e0bf650549949fec1d208a683.tar.gz fsf-binutils-gdb-d12b8d620c6aba8e0bf650549949fec1d208a683.tar.bz2 | |
asan : use of uninitialized value in buffer_and_nest
* macro.c (buffer_and_nest): Don't read past end of string buffer.
Diffstat (limited to 'gas/macro.c')
| -rw-r--r-- | gas/macro.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/gas/macro.c b/gas/macro.c index 9327a6d..cbb9574 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -184,14 +184,24 @@ buffer_and_nest (const char *from, const char *to, sb *ptr, { if (! flag_m68k_mri && ptr->ptr[i] == '.') i++; - if (from == NULL - && strncasecmp (ptr->ptr + i, "IRPC", from_len = 4) != 0 - && strncasecmp (ptr->ptr + i, "IRP", from_len = 3) != 0 - && strncasecmp (ptr->ptr + i, "IREPC", from_len = 5) != 0 - && strncasecmp (ptr->ptr + i, "IREP", from_len = 4) != 0 - && strncasecmp (ptr->ptr + i, "REPT", from_len = 4) != 0 - && strncasecmp (ptr->ptr + i, "REP", from_len = 3) != 0) - from_len = 0; + if (from == NULL) + { + size_t len = ptr->len - i; + if (len >= 5 && strncasecmp (ptr->ptr + i, "IREPC", 5) == 0) + from_len = 5; + else if (len >= 4 && strncasecmp (ptr->ptr + i, "IREP", 4) == 0) + from_len = 4; + else if (len >= 4 && strncasecmp (ptr->ptr + i, "IRPC", 4) == 0) + from_len = 4; + else if (len >= 4 && strncasecmp (ptr->ptr + i, "REPT", 4) == 0) + from_len = 4; + else if (len >= 3 && strncasecmp (ptr->ptr + i, "IRP", 3) == 0) + from_len = 3; + else if (len >= 3 && strncasecmp (ptr->ptr + i, "REP", 3) == 0) + from_len = 3; + else + from_len = 0; + } if ((from != NULL ? strncasecmp (ptr->ptr + i, from, from_len) == 0 : from_len > 0) @@ -199,7 +209,8 @@ buffer_and_nest (const char *from, const char *to, sb *ptr, || ! (is_part_of_name (ptr->ptr[i + from_len]) || is_name_ender (ptr->ptr[i + from_len])))) depth++; - if (strncasecmp (ptr->ptr + i, to, to_len) == 0 + if (ptr->len - i >= to_len + && strncasecmp (ptr->ptr + i, to, to_len) == 0 && (ptr->len == (i + to_len) || ! (is_part_of_name (ptr->ptr[i + to_len]) || is_name_ender (ptr->ptr[i + to_len])))) |