Bump support/2.16 branch #92

Closed
fyrchik wants to merge 12 commits from fyrchik:fix-support-2.16 into support/v2.16
Showing only changes of commit e4ac613c8e - Show all commits

View file

@ -346,17 +346,13 @@ func (o *Object) StableMarshal(buf []byte) []byte {
// SetMarshalData sets marshal data to reduce memory allocations. // SetMarshalData sets marshal data to reduce memory allocations.
// //
// It is unsafe to modify object data after setting marshal data. // It is unsafe to modify/copy object data after setting marshal data.
func (o *Object) SetMarshalData(data []byte) { func (o *Object) SetMarshalData(data []byte) {
if o == nil { if o == nil {
return return
} }
if data == nil {
o.marshalData = o.StableMarshal(nil)
} else {
o.marshalData = data o.marshalData = data
} }
}
func (o *Object) StableSize() (size int) { func (o *Object) StableSize() (size int) {
if o == nil { if o == nil {