Fixed "Assignment Branch Condition too high"

senuphtyz · senuphtyz · commit 1669b6e0ee2c · 2017-08-05T09:12:57.000+02:00
diff --git a/baked_in.go b/baked_in.go
@@ -1487,8 +1487,8 @@ func isHostname(fl FieldLevel) bool {
 func isFQDN(fl FieldLevel) bool {
 	val := fl.Field().String()
 
-	if val[len(val)-1] == '.' && val[len(val)-2] != '.' {
-		val = strings.TrimRight(val, ".")
+	if val[len(val)-1] == '.' {
+		val = val[0 : len(val)-1]
 	}
 
 	return hostnameRegex.MatchString(val) &&
diff --git a/validator_test.go b/validator_test.go
@@ -7182,6 +7182,7 @@ func TestFQDNValidation(t *testing.T) {
 		{"example24.com.", true},
 		{"test.example24.com.", true},
 		{"test24.example24.com.", true},
+		{"test24.example24.com..", false},
 		{"example", false},
 		{"192.168.0.1", false},
 		{"email@example.com", false},

Original file line number	Diff line number	Diff line change
`@@ -1487,8 +1487,8 @@ func isHostname(fl FieldLevel) bool {`
`1487`	`1487`	`func isFQDN(fl FieldLevel) bool {`
`1488`	`1488`	`val := fl.Field().String()`
`1489`	`1489`
`1490`		`- if val[len(val)-1] == '.' && val[len(val)-2] != '.' {`
`1491`		`- val = strings.TrimRight(val, ".")`
	`1490`	`+ if val[len(val)-1] == '.' {`
	`1491`	`+ val = val[0 : len(val)-1]`
`1492`	`1492`	`}`
`1493`	`1493`
`1494`	`1494`	`return hostnameRegex.MatchString(val) &&`