diff options
| -rw-r--r-- | api/next/56041.txt | 2 | ||||
| -rw-r--r-- | src/regexp/all_test.go | 1 | ||||
| -rw-r--r-- | src/regexp/syntax/parse.go | 9 |
3 files changed, 8 insertions, 4 deletions
diff --git a/api/next/56041.txt b/api/next/56041.txt new file mode 100644 index 0000000000..19cb164e7b --- /dev/null +++ b/api/next/56041.txt @@ -0,0 +1,2 @@ +pkg regexp/syntax, const ErrLarge = "expression too large" #56041 +pkg regexp/syntax, const ErrLarge ErrorCode #56041 diff --git a/src/regexp/all_test.go b/src/regexp/all_test.go index c233cfa9ea..52de3fef83 100644 --- a/src/regexp/all_test.go +++ b/src/regexp/all_test.go @@ -49,6 +49,7 @@ var badRe = []stringError{ {`a**`, "invalid nested repetition operator: `**`"}, {`a*+`, "invalid nested repetition operator: `*+`"}, {`\x`, "invalid escape sequence: `\\x`"}, + {strings.Repeat(`\pL`, 27000), "expression too large"}, } func compileTest(t *testing.T, expr string, error string) *Regexp { diff --git a/src/regexp/syntax/parse.go b/src/regexp/syntax/parse.go index 092dcfd5d0..accee9ab08 100644 --- a/src/regexp/syntax/parse.go +++ b/src/regexp/syntax/parse.go @@ -44,6 +44,7 @@ const ( ErrTrailingBackslash ErrorCode = "trailing backslash at end of expression" ErrUnexpectedParen ErrorCode = "unexpected )" ErrNestingDepth ErrorCode = "expression nests too deeply" + ErrLarge ErrorCode = "expression too large" ) func (e ErrorCode) String() string { @@ -159,7 +160,7 @@ func (p *parser) reuse(re *Regexp) { func (p *parser) checkLimits(re *Regexp) { if p.numRunes > maxRunes { - panic(ErrInternalError) + panic(ErrLarge) } p.checkSize(re) p.checkHeight(re) @@ -203,7 +204,7 @@ func (p *parser) checkSize(re *Regexp) { } if p.calcSize(re, true) > maxSize { - panic(ErrInternalError) + panic(ErrLarge) } } @@ -897,8 +898,8 @@ func parse(s string, flags Flags) (_ *Regexp, err error) { panic(r) case nil: // ok - case ErrInternalError: // too big - err = &Error{Code: ErrInternalError, Expr: s} + case ErrLarge: // too big + err = &Error{Code: ErrLarge, Expr: s} case ErrNestingDepth: err = &Error{Code: ErrNestingDepth, Expr: s} } |