mirrors/quickjs
1
0
Fork 0
mirror of https://github.com/bellard/quickjs.git synced 2025-05-12 03:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed the handling of unicode identifiers

Browse Source
This commit is contained in:
Fabrice Bellard 2025-04-10 10:34:40 +02:00
parent 9d3776d0d4
commit 25ffdb418e
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
quickjs.c
View File

@ -2861,14 +2861,26 @@ static JSAtom JS_NewAtomStr(JSContext *ctx, JSString *p)
return __JS_NewAtom(rt, p, JS_ATOM_TYPE_STRING); return __JS_NewAtom(rt, p, JS_ATOM_TYPE_STRING);
} }
/* XXX: optimize */
static size_t count_ascii(const uint8_t *buf, size_t len)
{
const uint8_t *p, *p_end;
p = buf;
p_end = buf + len;
while (p < p_end && *p < 128)
p++;
return p - buf;
}
/* str is UTF-8 encoded */ /* str is UTF-8 encoded */
JSAtom JS_NewAtomLen(JSContext *ctx, const char *str, size_t len) JSAtom JS_NewAtomLen(JSContext *ctx, const char *str, size_t len)
{ {
JSValue val; JSValue val;
if (len == 0 || !is_digit(*str)) { if (len == 0 ||
// XXX: this will not work if UTF-8 encoded str contains non ASCII bytes (!is_digit(*str) &&
JSAtom atom = __JS_FindAtom(ctx->rt, str, len, JS_ATOM_TYPE_STRING); count_ascii((const uint8_t *)str, len) == len)) {
JSAtom atom = __JS_FindAtom(ctx->rt, str, len, JS_ATOM_TYPE_STRING);
if (atom) if (atom)
return atom; return atom;
} }
@ -3810,10 +3822,8 @@ JSValue JS_NewStringLen(JSContext *ctx, const char *buf, size_t buf_len)
p_start = (const uint8_t *)buf; p_start = (const uint8_t *)buf;
p_end = p_start + buf_len; p_end = p_start + buf_len;
p = p_start; len1 = count_ascii(p_start, buf_len);
while (p < p_end && *p < 128) p = p_start + len1;
p++;
len1 = p - p_start;
if (len1 > JS_STRING_LEN_MAX) if (len1 > JS_STRING_LEN_MAX)
return JS_ThrowInternalError(ctx, "string too long"); return JS_ThrowInternalError(ctx, "string too long");
if (p == p_end) { if (p == p_end) {

7
tests/test_language.js
View File

@ -622,6 +622,12 @@ function test_optional_chaining()
assert((a?.["b"])().c, 42); assert((a?.["b"])().c, 42);
} }
function test_unicode_ident()
{
var õ = 3;
assert(typeof õ, "undefined");
}
test_op1(); test_op1();
test_cvt(); test_cvt();
test_eq(); test_eq();
@ -645,3 +651,4 @@ test_function_expr_name();
test_parse_semicolon(); test_parse_semicolon();
test_optional_chaining(); test_optional_chaining();
test_parse_arrow_function(); test_parse_arrow_function();
test_unicode_ident();