From 58a182ee3ce31193d40b6e87ae65e5e8f0d35bb5 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Wed, 11 Oct 2023 10:39:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
=?UTF-8?q?=D0=BE=20=D0=9F=D0=A0:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
=?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20int64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/schema/field/number.go | 3 +++
pkg/schema/field/number_test.go | 28 ++++++++++++++--------------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/pkg/schema/field/number.go b/pkg/schema/field/number.go
index d8dc218f..40d9c816 100644
--- a/pkg/schema/field/number.go
+++ b/pkg/schema/field/number.go
@@ -88,6 +88,9 @@ func (NumberType) decode(_ context.Context, field *Field, v interface{}) (interf
case NumberFormatInt:
switch i := n.(type) {
case int64:
+ if i > maxInt || i < minInt {
+ return nil, errors.New("integer out of range")
+ }
return i, nil
case uint64:
if i > maxInt {
diff --git a/pkg/schema/field/number_test.go b/pkg/schema/field/number_test.go
index da154cd0..367ffe42 100644
--- a/pkg/schema/field/number_test.go
+++ b/pkg/schema/field/number_test.go
@@ -15,20 +15,20 @@ func TestNumberField_Decode(t *testing.T) {
want interface{}
wantErr bool
}{
- {"Correct", Number("int"), int64(2), int64(2), false}, // #0
- {"Correct", Number("int"), 2.2, int64(2), false}, // #1
- {"Correct", Number("int"), 2, int64(2), false}, // #2
- {"Correct", Number("int"), float32(2.2), int64(2), false}, // #3
- {"Correct", Number("int"), float64(2.6), int64(3), false}, // #4
- {"Correct", Number("int"), 2.6, int64(3), false}, // #5
- {"MaxInt64", Number(NumberFormatInt), int64(math.MaxInt64), int64(math.MaxInt64), false}, // #6
- {"MinInt64", Number(NumberFormatInt), int64(math.MinInt64), int64(math.MinInt64), false}, // #7
- {"maxInt in float", Number(NumberFormatInt), float64(maxInt), int64(maxInt), false}, // #8
- {"minInt in float", Number(NumberFormatInt), float64(minInt), int64(minInt), false}, // #9
- {"Convert error", Number(NumberFormatInt), math.MaxFloat64, nil, true}, // #10
- {"Convert error", Number(NumberFormatInt), -math.MaxFloat64, nil, true}, // #11
- {"Convert error", Number(NumberFormatInt), float64(math.MaxInt64), nil, true}, // #13
- {"Convert error", Number(NumberFormatInt), float64(math.MinInt64), nil, true}, // #14
+ {"Correct", Number("int"), int64(2), int64(2), false}, // #0
+ {"Correct", Number("int"), 2.2, int64(2), false}, // #1
+ {"Correct", Number("int"), 2, int64(2), false}, // #2
+ {"Correct", Number("int"), float32(2.2), int64(2), false}, // #3
+ {"Correct", Number("int"), float64(2.6), int64(3), false}, // #4
+ {"Correct", Number("int"), 2.6, int64(3), false}, // #5
+ {"MaxInt64", Number(NumberFormatInt), int64(math.MaxInt64), nil, true}, // #6
+ {"MinInt64", Number(NumberFormatInt), int64(math.MinInt64), nil, true}, // #7
+ {"maxInt in float", Number(NumberFormatInt), float64(maxInt), int64(maxInt), false}, // #8
+ {"minInt in float", Number(NumberFormatInt), float64(minInt), int64(minInt), false}, // #9
+ {"Convert error", Number(NumberFormatInt), math.MaxFloat64, nil, true}, // #10
+ {"Convert error", Number(NumberFormatInt), -math.MaxFloat64, nil, true}, // #11
+ {"Convert error", Number(NumberFormatInt), float64(math.MaxInt64), nil, true}, // #13
+ {"Convert error", Number(NumberFormatInt), float64(math.MinInt64), nil, true}, // #14
{"Correct", Number("float"), int8(2), 2.0, false}, // #15
{"Correct", Number("float"), 2.2, 2.2, false}, // #16
--
GitLab