fix: length validation for utf8 strings

danielgtaylor · Mar 12, 2024 · 763b669 · 763b669
1 parent 13acb69
commit 763b669
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/validate.go b/validate.go
@@ -12,6 +12,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 	"unsafe"
 )
 
@@ -412,12 +413,12 @@ func Validate(r Registry, s *Schema, path *PathBuffer, mode ValidateMode, v any,
 		}
 
 		if s.MinLength != nil {
-			if len(str) < *s.MinLength {
+			if utf8.RuneCountInString(str) < *s.MinLength {
 				res.Addf(path, str, s.msgMinLength)
 			}
 		}
 		if s.MaxLength != nil {
-			if len(str) > *s.MaxLength {
+			if utf8.RuneCountInString(str) > *s.MaxLength {
 				res.Add(path, str, s.msgMaxLength)
 			}
 		}

diff --git a/validate_test.go b/validate_test.go
@@ -234,6 +234,13 @@ var validateTests = []struct {
 		}{}),
 		input: map[string]any{"value": "a"},
 	},
+	{
+		name: "non ascii max length success",
+		typ: reflect.TypeOf(struct {
+			Value string `json:"value" maxLength:"2"`
+		}{}),
+		input: map[string]any{"value": "аб"},
+	},
 	{
 		name: "max length fail",
 		typ: reflect.TypeOf(struct {