regexp/syntax: add and use ErrInvalidDepth

The fix for #51112 introduced a depth check but used ErrInternalError to avoid introduce new API in a CL that would be backported to earlier releases. New API accepted in proposal #51684. This CL adds a distinct error for this case. For #51112. Fixes #51684. Change-Id: I068fc70aafe4218386a06103d9b7c847fb7ffa65 Reviewed-on: https://go-review.googlesource.com/c/go/+/384617 Trust: Russ Cox <[email protected]> Run-TryBot: Russ Cox <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
golang · Apr 4, 2022 · 1af60b2 · 1af60b2
1 parent 492c85a
commit 1af60b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/api/next/regexpdepth.txt b/api/next/regexpdepth.txt
@@ -0,0 +1,3 @@
+pkg regexp/syntax, const ErrInvalidDepth = "invalid nesting depth" #0
+pkg regexp/syntax, const ErrInvalidDepth ErrorCode #0
+
diff --git a/src/regexp/syntax/parse.go b/src/regexp/syntax/parse.go
@@ -43,6 +43,7 @@ const (
 	ErrMissingRepeatArgument ErrorCode = "missing argument to repetition operator"
 	ErrTrailingBackslash     ErrorCode = "trailing backslash at end of expression"
 	ErrUnexpectedParen       ErrorCode = "unexpected )"
+	ErrInvalidDepth          ErrorCode = "invalid nesting depth"
 )
 
 func (e ErrorCode) String() string {
@@ -133,7 +134,7 @@ func (p *parser) checkHeight(re *Regexp) {
 		}
 	}
 	if p.calcHeight(re, true) > maxHeight {
-		panic(ErrInternalError)
+		panic(ErrInvalidDepth)
 	}
 }
 
@@ -756,8 +757,8 @@ func parse(s string, flags Flags) (_ *Regexp, err error) {
 			panic(r)
 		case nil:
 			// ok
-		case ErrInternalError:
-			err = &Error{Code: ErrInternalError, Expr: s}
+		case ErrInvalidDepth:
+			err = &Error{Code: ErrInvalidDepth, Expr: s}
 		}
 	}()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		pkg regexp/syntax, const ErrInvalidDepth = "invalid nesting depth" #0
		pkg regexp/syntax, const ErrInvalidDepth ErrorCode #0