1790f01dd9
* Upgrade xorm to v1.2.2 (#16663) Backport #16663 Fix #16683 * Add test to ensure that dumping of login sources remains correct (#16847) #16831 has occurred because of a missed regression. This PR adds a simple test to try to prevent this occuring again. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
68 lines
1.5 KiB
Go
Vendored
68 lines
1.5 KiB
Go
Vendored
package decoder
|
|
|
|
import (
|
|
"reflect"
|
|
"unsafe"
|
|
|
|
"github.com/goccy/go-json/internal/runtime"
|
|
)
|
|
|
|
type wrappedStringDecoder struct {
|
|
typ *runtime.Type
|
|
dec Decoder
|
|
stringDecoder *stringDecoder
|
|
structName string
|
|
fieldName string
|
|
isPtrType bool
|
|
}
|
|
|
|
func newWrappedStringDecoder(typ *runtime.Type, dec Decoder, structName, fieldName string) *wrappedStringDecoder {
|
|
return &wrappedStringDecoder{
|
|
typ: typ,
|
|
dec: dec,
|
|
stringDecoder: newStringDecoder(structName, fieldName),
|
|
structName: structName,
|
|
fieldName: fieldName,
|
|
isPtrType: typ.Kind() == reflect.Ptr,
|
|
}
|
|
}
|
|
|
|
func (d *wrappedStringDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) error {
|
|
bytes, err := d.stringDecoder.decodeStreamByte(s)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if bytes == nil {
|
|
if d.isPtrType {
|
|
*(*unsafe.Pointer)(p) = nil
|
|
}
|
|
return nil
|
|
}
|
|
b := make([]byte, len(bytes)+1)
|
|
copy(b, bytes)
|
|
if _, err := d.dec.Decode(&RuntimeContext{Buf: b}, 0, depth, p); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (d *wrappedStringDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.Pointer) (int64, error) {
|
|
bytes, c, err := d.stringDecoder.decodeByte(ctx.Buf, cursor)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
if bytes == nil {
|
|
if d.isPtrType {
|
|
*(*unsafe.Pointer)(p) = nil
|
|
}
|
|
return c, nil
|
|
}
|
|
bytes = append(bytes, nul)
|
|
oldBuf := ctx.Buf
|
|
ctx.Buf = bytes
|
|
if _, err := d.dec.Decode(ctx, 0, depth, p); err != nil {
|
|
return 0, err
|
|
}
|
|
ctx.Buf = oldBuf
|
|
return c, nil
|
|
}
|