Skip to content

Revert "Fix panic when the decoding pointer type with custom decoding function" #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deankarn merged 1 commit into from
Mar 21, 2025
Merged

Revert "Fix panic when the decoding pointer type with custom decoding function" #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,8 @@ func (d *decoder) setFieldByType(current reflect.Value, namespace []byte, idx in
d.setError(namespace, err)
return
}
if kind == reflect.Ptr {
newVal := reflect.New(v.Type().Elem())
if set = d.setFieldByType(newVal.Elem(), namespace, idx); set {
v.Set(newVal)
}
} else {
v.Set(reflect.ValueOf(val))
}

v.Set(reflect.ValueOf(val))
set = true
return
}
Expand Down
55 changes: 6 additions & 49 deletions decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,71 +830,28 @@ func TestDecoderStruct(t *testing.T) {

func TestDecoderNativeTime(t *testing.T) {

type TType time.Time
type TTypePtr *time.Time
type TTypePtrWithCustomDecoder *time.Time

type TestError struct {
Time time.Time
TimeNoValue time.Time
TimePtr *time.Time
TimeType TType
TimeTypeNoValue TType
TimeTypePtr TTypePtr
TimeTypePtrNoValue TTypePtr
TimeTypePtrWithCustomDecoder TTypePtrWithCustomDecoder
TimeTypePtrWithCustomDecoderNoValue TTypePtrWithCustomDecoder
Time time.Time
TimeNoValue time.Time
TimePtr *time.Time
}

values := url.Values{
"Time": []string{"2006-01-02T15:04:05Z"},
"TimeNoValue": []string{""},
"TimePtr": []string{"2006-01-02T15:04:05Z"},
"TimeType": []string{"2006-01-02T15:04:05Z"},
"TimeTypeNoValue": []string{""},
"TimeTypePtr": []string{"2006-01-02T15:04:05Z"},
"TimeTypePtrNoValue": []string{""},
"TimeTypePtrWithCustomDecoder": []string{"2006-01-02T15:04:05Z"},
"TimeTypePtrWithCustomDecoderNoValue": []string{""},
"Time": []string{"2006-01-02T15:04:05Z"},
"TimeNoValue": []string{""},
"TimePtr": []string{"2006-01-02T15:04:05Z"},
}

var test TestError

decoder := NewDecoder()
decoder.RegisterCustomTypeFunc(func(s []string) (interface{}, error) {
if s[0] == "" {
return TType{}, nil
}
parsed, err := time.Parse(time.RFC3339, s[0])
if err != nil {
return nil, err
}
return TType(parsed), nil
}, TType{})
decoder.RegisterCustomTypeFunc(func(s []string) (interface{}, error) {
if s[0] == "" {
return nil, nil
}
parsed, err := time.Parse(time.RFC3339, s[0])
if err != nil {
return nil, err
}
return TTypePtrWithCustomDecoder(&parsed), nil
}, TTypePtrWithCustomDecoder(nil))

errs := decoder.Decode(&test, values)
Equal(t, errs, nil)

tm, _ := time.Parse(time.RFC3339, "2006-01-02T15:04:05Z")
Equal(t, test.Time.Equal(tm), true)
Equal(t, test.TimeNoValue.Equal(tm), false)
Equal(t, tm.Equal(time.Time(test.TimeType)), true)
Equal(t, time.Time(test.TimeTypeNoValue).Equal(tm), false)
Equal(t, time.Time(test.TimeTypeNoValue).IsZero(), true)
Equal(t, (*time.Time)(test.TimeTypePtr).Equal(tm), true)
Equal(t, test.TimeTypePtrNoValue, nil)
Equal(t, (*time.Time)(test.TimeTypePtrWithCustomDecoder).Equal(tm), true)
Equal(t, test.TimeTypePtrWithCustomDecoderNoValue, nil)

NotEqual(t, test.TimePtr, nil)
Equal(t, (*test.TimePtr).Equal(tm), true)
Expand Down