fix: binding time with empty value (gin-gonic#4098)

ksw2000 · Nov 21, 2024 · 67a65f1 · 67a65f1
1 parent e46bd52
commit 67a65f1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/binding/form_mapping.go b/binding/form_mapping.go
@@ -399,6 +399,10 @@ func setTimeField(val string, structField reflect.StructField, value reflect.Val
 
 	switch tf := strings.ToLower(timeFormat); tf {
 	case "unix", "unixnano":
+		if val == "" {
+			val = "0"
+		}
+
 		tv, err := strconv.ParseInt(val, 10, 64)
 		if err != nil {
 			return err

diff --git a/binding/form_mapping_test.go b/binding/form_mapping_test.go
@@ -183,30 +183,33 @@ func TestMapFormWithTag(t *testing.T) {
 
 func TestMappingTime(t *testing.T) {
 	var s struct {
-		Time      time.Time
-		LocalTime time.Time `time_format:"2006-01-02"`
-		ZeroValue time.Time
-		CSTTime   time.Time `time_format:"2006-01-02" time_location:"Asia/Shanghai"`
-		UTCTime   time.Time `time_format:"2006-01-02" time_utc:"1"`
+		Time         time.Time
+		LocalTime    time.Time `time_format:"2006-01-02"`
+		ZeroValue    time.Time
+		ZeroUnixTime time.Time `time_format:"unix"` // see issue #4098
+		CSTTime      time.Time `time_format:"2006-01-02" time_location:"Asia/Shanghai"`
+		UTCTime      time.Time `time_format:"2006-01-02" time_utc:"1"`
 	}
 
 	var err error
 	time.Local, err = time.LoadLocation("Europe/Berlin")
 	require.NoError(t, err)
 
 	err = mapForm(&s, map[string][]string{
-		"Time":      {"2019-01-20T16:02:58Z"},
-		"LocalTime": {"2019-01-20"},
-		"ZeroValue": {},
-		"CSTTime":   {"2019-01-20"},
-		"UTCTime":   {"2019-01-20"},
+		"Time":         {"2019-01-20T16:02:58Z"},
+		"LocalTime":    {"2019-01-20"},
+		"ZeroValue":    {},
+		"ZeroUnixTime": {},
+		"CSTTime":      {"2019-01-20"},
+		"UTCTime":      {"2019-01-20"},
 	})
 	require.NoError(t, err)
 
 	assert.Equal(t, "2019-01-20 16:02:58 +0000 UTC", s.Time.String())
 	assert.Equal(t, "2019-01-20 00:00:00 +0100 CET", s.LocalTime.String())
 	assert.Equal(t, "2019-01-19 23:00:00 +0000 UTC", s.LocalTime.UTC().String())
 	assert.Equal(t, "0001-01-01 00:00:00 +0000 UTC", s.ZeroValue.String())
+	assert.Equal(t, "1970-01-01 00:00:00 +0000 UTC", s.ZeroUnixTime.UTC().String())
 	assert.Equal(t, "2019-01-20 00:00:00 +0800 CST", s.CSTTime.String())
 	assert.Equal(t, "2019-01-19 16:00:00 +0000 UTC", s.CSTTime.UTC().String())
 	assert.Equal(t, "2019-01-20 00:00:00 +0000 UTC", s.UTCTime.String())