The decimal's range should not be parsed if parsing fraction digits f…

…ails
openconfig · Nov 11, 2020 · c0ea443 · c0ea443
1 parent ec3a833
commit c0ea443
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/pkg/yang/types.go b/pkg/yang/types.go
@@ -280,7 +280,8 @@ check:
 		y.IdentityBase = resolvedBase.Identity
 	}
 
-	if t.Range != nil {
+	// If parsing fractionDigits fails, the ranges should not be parsed
+	if t.Range != nil && isDecimal64 && y.FractionDigits != 0 {
 		yr, err := parseRanges(t.Range.Name, isDecimal64, uint8(y.FractionDigits))
 		switch {
 		case err != nil:

diff --git a/pkg/yang/types_builtin.go b/pkg/yang/types_builtin.go
@@ -623,7 +623,7 @@ func ParseDecimal(s string, fracDigRequired uint8) (n Number, err error) {
 // numStr must conform to Section 9.3.4.
 func decimalValueFromString(numStr string, fracDigRequired uint8) (n Number, err error) {
 	if fracDigRequired > MaxFractionDigits || fracDigRequired < 1 {
-		return n, fmt.Errorf("invalid number of fraction digits %d > max of %d, minimum 1", fracDigRequired, MaxFractionDigits)
+		return n, fmt.Errorf("invalid number of fraction digits %d: out of range [1..%d]", fracDigRequired, MaxFractionDigits)
 	}
 
 	s := numStr

diff --git a/pkg/yang/types_test.go b/pkg/yang/types_test.go
@@ -67,6 +67,14 @@ func TestTypeResolve(t *testing.T) {
 			},
 			err: "unknown: value 42 out of range [1..18]",
 		},
+		{
+			in: &Type{
+				Name:           "decimal64",
+				FractionDigits: &Value{Name: "42"},
+				Range:          &Range{Name: "-10 .. 10"},
+			},
+			err: "unknown: value 42 out of range [1..18]",
+		},
 		{
 			in: &Type{
 				Name:           "decimal64",