re
/
go-json
forked from mirror/go-json
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix encoding of pointered MarshalJSON type with omitempty

This commit is contained in:
Masaaki Goshima 2021-01-22 18:26:28 +09:00
parent d59cdefc1d
commit fa4d5842e6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
encode_vm.go
View File

@ -7871,7 +7871,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, b []byte, code *opcode) ([]byte
ptr := load(ctxptr, code.headIdx) ptr := load(ctxptr, code.headIdx)
p := ptr + code.offset p := ptr + code.offset
v := e.ptrToInterface(code, p) v := e.ptrToInterface(code, p)
if v != nil { if v != nil && (code.typ.Kind() != reflect.Ptr || e.ptrToPtr(p) != 0) {
bb, err := v.(Marshaler).MarshalJSON() bb, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return nil, errMarshaler(code, err) return nil, errMarshaler(code, err)
@ -9060,7 +9060,7 @@ func (e *Encoder) run(ctx *encodeRuntimeContext, b []byte, code *opcode) ([]byte
ptr := load(ctxptr, code.headIdx) ptr := load(ctxptr, code.headIdx)
p := ptr + code.offset p := ptr + code.offset
v := e.ptrToInterface(code, p) v := e.ptrToInterface(code, p)
if v != nil { if v != nil && (code.typ.Kind() != reflect.Ptr || e.ptrToPtr(p) != 0) {
bb, err := v.(Marshaler).MarshalJSON() bb, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return nil, errMarshaler(code, err) return nil, errMarshaler(code, err)

4
encode_vm_escaped.go
View File

@ -7841,7 +7841,7 @@ func (e *Encoder) runEscaped(ctx *encodeRuntimeContext, b []byte, code *opcode)
ptr := load(ctxptr, code.headIdx) ptr := load(ctxptr, code.headIdx)
p := ptr + code.offset p := ptr + code.offset
v := e.ptrToInterface(code, p) v := e.ptrToInterface(code, p)
if v != nil { if v != nil && (code.typ.Kind() != reflect.Ptr || e.ptrToPtr(p) != 0) {
bb, err := v.(Marshaler).MarshalJSON() bb, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return nil, errMarshaler(code, err) return nil, errMarshaler(code, err)
@ -9046,7 +9046,7 @@ func (e *Encoder) runEscaped(ctx *encodeRuntimeContext, b []byte, code *opcode)
ptr := load(ctxptr, code.headIdx) ptr := load(ctxptr, code.headIdx)
p := ptr + code.offset p := ptr + code.offset
v := e.ptrToInterface(code, p) v := e.ptrToInterface(code, p)
if v != nil { if v != nil && (code.typ.Kind() != reflect.Ptr || e.ptrToPtr(p) != 0) {
bb, err := v.(Marshaler).MarshalJSON() bb, err := v.(Marshaler).MarshalJSON()
if err != nil { if err != nil {
return nil, errMarshaler(code, err) return nil, errMarshaler(code, err)