Skip to content

GODRIVER-3436 Avoid initializing null data given custom decoder #1902

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
merged 4 commits into from
Dec 6, 2024
Merged

GODRIVER-3436 Avoid initializing null data given custom decoder #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
376087a
GODRIVER-3436 Avoid initializing null data given custom decoder
prestonvasquez Dec 5, 2024
101fb6d
GODRIVER-3436 Update test name
prestonvasquez Dec 5, 2024
080bf13
GODRIVER-3436 Update test name
prestonvasquez Dec 5, 2024
8413567
GODRIVER-3436 Use ValueUnmarshaler for test
prestonvasquez Dec 5, 2024
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
6 changes: 6 additions & 0 deletions bson/bsoncodec/default_value_decoders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,12 @@ func (dvd DefaultValueDecoders) ValueUnmarshalerDecodeValue(_ DecodeContext, vr
return ValueDecoderError{Name: "ValueUnmarshalerDecodeValue", Types: []reflect.Type{tValueUnmarshaler}, Received: val}
}

if vr.Type() == bsontype.Null {
val.Set(reflect.Zero(val.Type()))

return vr.ReadNull()
}

if val.Kind() == reflect.Ptr && val.IsNil() {
if !val.CanSet() {
return ValueDecoderError{Name: "ValueUnmarshalerDecodeValue", Types: []reflect.Type{tValueUnmarshaler}, Received: val}
Expand Down
19 changes: 19 additions & 0 deletions bson/unmarshaling_cases_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,25 @@ type unmarshalerNonPtrStruct struct {

type myInt64 int64

var _ ValueUnmarshaler = (*myInt64)(nil)

func (mi *myInt64) UnmarshalBSONValue(t bsontype.Type, bytes []byte) error {
if len(bytes) == 0 {
return nil
}

if t == bsontype.Int64 {
i, err := bsonrw.NewBSONValueReader(bsontype.Int64, bytes).ReadInt64()
if err != nil {
return err
}

*mi = myInt64(i)
}

return nil
}

func (mi *myInt64) UnmarshalBSON(bytes []byte) error {
if len(bytes) == 0 {
return nil
Expand Down
Loading