dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 04:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(regex): panic on displaying surrogated UnicodeEscape characters. (#5469)

Browse source 
fixes https://github.com/oxc-project/oxc/pull/5387#issuecomment-2330534180
This commit is contained in:
rzvxa 2024-09-05 06:18:11 +00:00
parent 0df1d9d97b
commit 9b984b31bd
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/oxc_regular_expression/src/display.rs
View file

@ -356,7 +356,7 @@ fn character_to_string(
) -> (/* result */ String, /* true of peek should be consumed */ bool) {
let cp = this.value;
if let CharacterKind::Symbol = this.kind {
if matches!(this.kind, CharacterKind::Symbol | CharacterKind::UnicodeEscape) {
// Trail only
if is_trail_surrogate(cp) {
return (format!(r"\u{cp:X}"), false);
@ -493,7 +493,7 @@ mod test {
(r"/\d/g", None),
// we lose the flags ordering
(r"/\d/ug", Some(r"/\d/gu")),
// NOTE: we capitalize hex unicodes.
// we capitalize hex unicodes.
(r"/\n\cM\0\x41\u{1f600}\./u", Some(r"/\n\cM\0\x41\u{1F600}\./u")),
(r"/c]/", None),
// Octal tests from: <https://github.com/tc39/test262/blob/d62fa93c8f9ce5e687c0bbaa5d2b59670ab2ff60/test/annexB/language/literals/regexp/legacy-octal-escape.js>
@ -540,6 +540,14 @@ mod test {
(r"/[\c8]/", None),
(r"/[\c80]+/", None),
(r"/\c_/", None),
// we capitalize hex unicodes.
(r"/^|\udf06/gu", Some(r"/^|\uDF06/gu")),
// we capitalize hex unicodes.
(r"/\udf06/", Some(r"/\uDF06/")),
// we capitalize hex unicodes.
(r"/\udf06/u", Some(r"/\uDF06/u")),
// we capitalize hex unicodes.
(r"/^|\udf06/g", Some(r"/^|\uDF06/g")),
];
fn test_display(allocator: &Allocator, (source, expect): &Case) {