Merge pull request #4490 from helixbass/iss4489_regex_octal_escape_se…

…quence_bug Fix #4489: Regex octal escape sequence bug
jashkenas · Apr 7, 2017 · 90ec761 · 90ec761
2 parents c1e3c02 + 050aaa4
commit 90ec761
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -763,10 +763,14 @@ exports.Lexer = class Lexer
 
  # Validates escapes in strings and regexes.
  validateEscapes: (str, options = {}) ->
- match = INVALID_ESCAPE.exec str
+ invalid_escape_regex =
+ if options.isRegex
+ REGEX_INVALID_ESCAPE
+ else
+ STRING_INVALID_ESCAPE
+ match = invalid_escape_regex.exec str
  return unless match
  [[], before, octal, hex, unicode] = match
- return if options.isRegex and octal and octal.charAt(0) isnt '0'
  message =
  if octal
  "octal escape sequences are not allowed"
@@ -978,14 +982,22 @@ HERECOMMENT_ILLEGAL = /\*\//
 
 LINE_CONTINUER = /// ^ \s* (?: , | \??\.(?![.\d]) | :: ) ///
 
-INVALID_ESCAPE  = ///
+STRING_INVALID_ESCAPE = ///
  ( (?:^|[^\\]) (?:\\\\)* ) # make sure the escape isn’t escaped
  \\ (
  ?: (0[0-7]|[1-7]) # octal escape
  | (x(?![\da-fA-F]{2}).{0,2}) # hex escape
  | (u(?![\da-fA-F]{4}).{0,4}) # unicode escape
  )
 ///
+REGEX_INVALID_ESCAPE = ///
+ ( (?:^|[^\\]) (?:\\\\)* ) # make sure the escape isn’t escaped
+ \\ (
+ ?: (0[0-7]) # octal escape
+ | (x(?![\da-fA-F]{2}).{0,2}) # hex escape
+ | (u(?![\da-fA-F]{4}).{0,4}) # unicode escape
+ )
+///
 
 LEADING_BLANK_LINE = /^[^\n\S]*\n/
 TRAILING_BLANK_LINE = /\n[^\n\S]*$/

diff --git a/test/error_messages.coffee b/test/error_messages.coffee
@@ -456,6 +456,13 @@ test "octal escapes", ->
  /a\\0\\tb\\\\\\07c/
  \  \  \ \ ^\^^
  '''
+ assertErrorFormat '''
+ /a\\1\\tb\\\\\\07c/
+ ''', '''
+ [stdin]:1:10: error: octal escape sequences are not allowed \\07
+ /a\\1\\tb\\\\\\07c/
+ \  \  \ \ ^\^^
+ '''
  assertErrorFormat '''
  ///a
  #{b} \\01///