Correct benign mistake in off-by-one guard

rneatherway · rneatherway · commit 0e51ec1699f5 · 2021-08-19T14:41:04.000+01:00
m[2] is the third element of m, rather than the second, so we have to
check instead that the len of m is at least 3.

Because the regular expression has two capture groups, the length of m
will always be 3, so currently the guard will always be true.
diff --git a/pkg/cmd/api/pagination.go b/pkg/cmd/api/pagination.go
@@ -14,7 +14,7 @@ var linkRE = regexp.MustCompile(`<([^>]+)>;\s*rel="([^"]+)"`)
 
 func findNextPage(resp *http.Response) (string, bool) {
 	for _, m := range linkRE.FindAllStringSubmatch(resp.Header.Get("Link"), -1) {
-		if len(m) >= 2 && m[2] == "next" {
+		if len(m) > 2 && m[2] == "next" {
 			return m[1], true
 		}
 	}
diff --git a/pkg/cmd/secret/list/list.go b/pkg/cmd/secret/list/list.go
@@ -250,7 +250,7 @@ var linkRE = regexp.MustCompile(`<([^>]+)>;\s*rel="([^"]+)"`)
 
 func findNextPage(link string) string {
 	for _, m := range linkRE.FindAllStringSubmatch(link, -1) {
-		if len(m) >= 2 && m[2] == "next" {
+		if len(m) > 2 && m[2] == "next" {
 			return m[1]
 		}
 	}

Original file line number	Diff line number	Diff line change
@@ -14,7 +14,7 @@ var linkRE = regexp.MustCompile(`<([^>]+)>;\s*rel="([^"]+)"`)
`14`	`14`
`15`	`15`	`func findNextPage(resp *http.Response) (string, bool) {`
`16`	`16`	`for _, m := range linkRE.FindAllStringSubmatch(resp.Header.Get("Link"), -1) {`
`17`		`- if len(m) >= 2 && m[2] == "next" {`
	`17`	`+ if len(m) > 2 && m[2] == "next" {`
`18`	`18`	`return m[1], true`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
@@ -250,7 +250,7 @@ var linkRE = regexp.MustCompile(`<([^>]+)>;\s*rel="([^"]+)"`)
`250`	`250`
`251`	`251`	`func findNextPage(link string) string {`
`252`	`252`	`for _, m := range linkRE.FindAllStringSubmatch(link, -1) {`
`253`		`- if len(m) >= 2 && m[2] == "next" {`
	`253`	`+ if len(m) > 2 && m[2] == "next" {`
`254`	`254`	`return m[1]`
`255`	`255`	`}`
`256`	`256`	`}`