From f405494f214315091fb0864827b07b5e6f12ee84 Mon Sep 17 00:00:00 2001 From: Alex Coplan Date: Thu, 2 Jul 2020 13:53:07 +0100 Subject: [PATCH] aarch64: Fix segfault on unicode symbols MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch fixes a segfault which occurs when the AArch64 backend parses a symbol operand that begins with a register name and ends with a unicode byte (byte value > 127). For example, the following input causes the crash: x0é: udf x0é gas/ChangeLog: 2020-07-02 Alex Coplan * config/tc-aarch64.c (reg_name_p): Fix cast so that we don't segfault on negative chars. * testsuite/gas/aarch64/reglike-label-unicode-segv.d: New test. * testsuite/gas/aarch64/reglike-label-unicode-segv.s: Input. --- gas/ChangeLog | 7 +++++++ gas/config/tc-aarch64.c | 2 +- gas/testsuite/gas/aarch64/reglike-label-unicode-segv.d | 8 ++++++++ gas/testsuite/gas/aarch64/reglike-label-unicode-segv.s | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gas/testsuite/gas/aarch64/reglike-label-unicode-segv.d create mode 100644 gas/testsuite/gas/aarch64/reglike-label-unicode-segv.s diff --git a/gas/ChangeLog b/gas/ChangeLog index 864c6cde220..c4b04f02bdf 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2020-07-02 Alex Coplan + + * config/tc-aarch64.c (reg_name_p): Fix cast so that we don't + segfault on negative chars. + * testsuite/gas/aarch64/reglike-label-unicode-segv.d: New test. + * testsuite/gas/aarch64/reglike-label-unicode-segv.s: Input. + 2020-07-02 Nick Clifton PR 26028 diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index 728fd10a4e2..ecb15d23437 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -2190,7 +2190,7 @@ reg_name_p (char *str, aarch64_reg_type reg_type) return FALSE; skip_whitespace (str); - if (*str == ',' || is_end_of_line[(unsigned int) *str]) + if (*str == ',' || is_end_of_line[(unsigned char) *str]) return TRUE; return FALSE; diff --git a/gas/testsuite/gas/aarch64/reglike-label-unicode-segv.d b/gas/testsuite/gas/aarch64/reglike-label-unicode-segv.d new file mode 100644 index 00000000000..f262e6f75ab --- /dev/null +++ b/gas/testsuite/gas/aarch64/reglike-label-unicode-segv.d @@ -0,0 +1,8 @@ +#objdump: -dr + +.*: file format .* + +Disassembly of section \.text: + +0+ : +.*: 00000000 udf #0 diff --git a/gas/testsuite/gas/aarch64/reglike-label-unicode-segv.s b/gas/testsuite/gas/aarch64/reglike-label-unicode-segv.s new file mode 100644 index 00000000000..18f1e929571 --- /dev/null +++ b/gas/testsuite/gas/aarch64/reglike-label-unicode-segv.s @@ -0,0 +1,2 @@ +x0é: +udf x0é -- 2.30.2