Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

asan : use of uninitialized value in buffer_and_nest

Browse Source 
* macro.c (buffer_and_nest): Don't read past end of string buffer.
This commit is contained in:
Alan Modra
2022-02-15 14:35:14 +10:30
parent fe69d4fcf0
commit d12b8d620c
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gas/macro.c
View File

@@ -184,14 +184,24 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
{ {
if (! flag_m68k_mri && ptr->ptr[i] == '.') if (! flag_m68k_mri && ptr->ptr[i] == '.')
i++; i++;
if (from == NULL if (from == NULL)
&& strncasecmp (ptr->ptr + i, "IRPC", from_len = 4) != 0 {
&& strncasecmp (ptr->ptr + i, "IRP", from_len = 3) != 0 size_t len = ptr->len - i;
&& strncasecmp (ptr->ptr + i, "IREPC", from_len = 5) != 0 if (len >= 5 && strncasecmp (ptr->ptr + i, "IREPC", 5) == 0)
&& strncasecmp (ptr->ptr + i, "IREP", from_len = 4) != 0 from_len = 5;
&& strncasecmp (ptr->ptr + i, "REPT", from_len = 4) != 0 else if (len >= 4 && strncasecmp (ptr->ptr + i, "IREP", 4) == 0)
&& strncasecmp (ptr->ptr + i, "REP", from_len = 3) != 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; from_len = 0;
}
if ((from != NULL if ((from != NULL
? strncasecmp (ptr->ptr + i, from, from_len) == 0 ? strncasecmp (ptr->ptr + i, from, from_len) == 0
: 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_part_of_name (ptr->ptr[i + from_len])
|| is_name_ender (ptr->ptr[i + from_len])))) || is_name_ender (ptr->ptr[i + from_len]))))
depth++; 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) && (ptr->len == (i + to_len)
|| ! (is_part_of_name (ptr->ptr[i + to_len]) || ! (is_part_of_name (ptr->ptr[i + to_len])
|| is_name_ender (ptr->ptr[i + to_len])))) || is_name_ender (ptr->ptr[i + to_len]))))