Browse Source

wrap the regress panic for now (#1027)

pull/1036/head
Jason Williams 4 years ago committed by GitHub
parent
commit
98945c8cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      boa/src/builtins/regexp/mod.rs
  2. 9
      boa/src/builtins/regexp/tests.rs

13
boa/src/builtins/regexp/mod.rs

@ -98,7 +98,7 @@ impl RegExp {
pub(crate) const LENGTH: usize = 2; pub(crate) const LENGTH: usize = 2;
/// Create a new `RegExp` /// Create a new `RegExp`
pub(crate) fn constructor(this: &Value, args: &[Value], _: &mut Context) -> Result<Value> { pub(crate) fn constructor(this: &Value, args: &[Value], ctx: &mut Context) -> Result<Value> {
let arg = args.get(0).ok_or_else(Value::undefined)?; let arg = args.get(0).ok_or_else(Value::undefined)?;
let (regex_body, mut regex_flags) = match arg { let (regex_body, mut regex_flags) = match arg {
@ -161,8 +161,15 @@ impl RegExp {
sorted_flags.push('y'); sorted_flags.push('y');
} }
let matcher = Regex::with_flags(&regex_body, sorted_flags.as_str()) let matcher = match Regex::with_flags(&regex_body, sorted_flags.as_str()) {
.expect("failed to create matcher"); Err(error) => {
return Err(
ctx.construct_syntax_error(format!("failed to create matcher: {}", error.text))
);
}
Ok(val) => val,
};
let regexp = RegExp { let regexp = RegExp {
matcher, matcher,
use_last_index: global || sticky, use_last_index: global || sticky,

9
boa/src/builtins/regexp/tests.rs

@ -98,3 +98,12 @@ fn to_string() {
); );
assert_eq!(forward(&mut context, "/\\n/g.toString()"), "\"/\\n/g\""); assert_eq!(forward(&mut context, "/\\n/g.toString()"), "\"/\\n/g\"");
} }
#[test]
fn no_panic_on_invalid_character_escape() {
let mut context = Context::new();
// This used to panic, we now return an error
// The line below should not cause Boa to panic
forward(&mut context, r"const a = /,\;/");
}

Loading…
Cancel
Save