From d3c3fe781424c866ad64ce9a8e3b649b30a0b5ae Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 20 Oct 2020 18:27:47 +0300 Subject: [PATCH] Avoid assertion violations in malformed Unicode escapes * src/lread.c (read_escape): Produce better diagnostic for malformed \u Unicode escapes, while avoiding assertion violation when READCHAR returns -1 because the input is exhausted. (Bug#44084) --- src/lread.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lread.c b/src/lread.c index 4b788e99407..a3d5fd7bb81 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2573,6 +2573,13 @@ read_escape (Lisp_Object readcharfun, bool stringp) while (++count <= unicode_hex_count) { c = READCHAR; + if (c < 0) + { + if (unicode_hex_count > 4) + error ("Malformed Unicode escape: \\U%x", i); + else + error ("Malformed Unicode escape: \\u%x", i); + } /* `isdigit' and `isalpha' may be locale-specific, which we don't want. */ int digit = char_hexdigit (c); -- 2.39.2