Skip to content

Commit

Permalink
wrap the regress panic for now (#1027)
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonwilliams authored Jan 2, 2021
1 parent 1052ccd commit 98945c8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
13 changes: 10 additions & 3 deletions boa/src/builtins/regexp/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl RegExp {
pub(crate) const LENGTH: usize = 2;

/// 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 (regex_body, mut regex_flags) = match arg {
Expand Down Expand Up @@ -161,8 +161,15 @@ impl RegExp {
sorted_flags.push('y');
}

let matcher = Regex::with_flags(&regex_body, sorted_flags.as_str())
.expect("failed to create matcher");
let matcher = match Regex::with_flags(&regex_body, sorted_flags.as_str()) {
Err(error) => {
return Err(
ctx.construct_syntax_error(format!("failed to create matcher: {}", error.text))
);
}
Ok(val) => val,
};

let regexp = RegExp {
matcher,
use_last_index: global || sticky,
Expand Down
9 changes: 9 additions & 0 deletions boa/src/builtins/regexp/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,12 @@ fn to_string() {
);
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 = /,\;/");
}

0 comments on commit 98945c8

Please sign in to comment.